diff --git a/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java b/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java
index ac809f6..a17fd19 100644
--- a/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java
+++ b/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java
@@ -208,7 +208,7 @@ public class SchedulingController {
      * @return com.gaotao.common.utils.R
      **/
     @RequestMapping(value = "getOrderPartStockedQty")
-    public R getOrderPartStockedQty(SearchScheduleData inData){
+    public R getOrderPartStockedQty(@RequestBody SearchScheduleData inData){
         List<Map<String, Object>> resultList = schedulingService.getOrderPartStockedQty(inData);
         return R.ok()
                 .put("code", 200)
@@ -262,4 +262,21 @@ public class SchedulingController {
                 .put("msg", "操作成功!");
     }
 
+    /**
+     * TODO 根据条件获取日历编码和日历的描述信息
+     * @author LR
+     * @date 2022/3/23 17:00
+     * @Param [inData]
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "getCalendarMapByResourceId")
+    public R getCalendarMapByResourceId(@RequestBody SearchScheduleData inData){
+       Map<String, Object> resultMap = schedulingService.getCalendarMapByResourceId(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功!")
+                .put("row", resultMap);
+    }
+
+
 }
diff --git a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
index 55f2567..a469cd4 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
@@ -111,10 +111,10 @@ public class SearchScheduleData extends BaseData {
     private boolean newRollFlag;//是否是新卷
     private String specifiedTime;//是否制定排产的时间
     private Float scheduledQty;//排产的数量
-    private int waitTimes;//等待时间
+    private Integer waitTimes;//等待时间
     private boolean currentRollFlag;//是否按照当前卷来查询
     private String createNewRollFlag;//是否创建当前新卷
-    private int scheduleSeqNo;//排产页面的序号
+    private Integer scheduleSeqNo;//排产页面的序号
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date planStartTime;//排产页面开始时间
@@ -831,11 +831,11 @@ public class SearchScheduleData extends BaseData {
         this.scheduledQty = scheduledQty;
     }
 
-    public int getWaitTimes() {
+    public Integer getWaitTimes() {
         return waitTimes;
     }
 
-    public void setWaitTimes(int waitTimes) {
+    public void setWaitTimes(Integer waitTimes) {
         this.waitTimes = waitTimes;
     }
 
@@ -855,11 +855,11 @@ public class SearchScheduleData extends BaseData {
         this.createNewRollFlag = createNewRollFlag;
     }
 
-    public int getScheduleSeqNo() {
+    public Integer getScheduleSeqNo() {
         return scheduleSeqNo;
     }
 
-    public void setScheduleSeqNo(int scheduleSeqNo) {
+    public void setScheduleSeqNo(Integer scheduleSeqNo) {
         this.scheduleSeqNo = scheduleSeqNo;
     }
 
diff --git a/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java b/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java
index 57ec573..bde072d 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java
@@ -160,4 +160,13 @@ public interface SchedulingService {
      * @return void
      **/
     void refreshScheduleByCalendar(SearchScheduleData inData);
+
+    /**
+     * TODO 根据条件获取日历编码和日历的描述信息
+     * @author LR
+     * @date 2022/3/23 17:01
+     * @Param [inData]
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     **/
+    Map<String, Object> getCalendarMapByResourceId(SearchScheduleData inData);
 }
diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java
index 1f40c27..c32060b 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java
@@ -661,5 +661,10 @@ public class SchedulingServiceImpl implements SchedulingService {
         }
     }
 
+    @Override
+    public Map<String, Object> getCalendarMapByResourceId(SearchScheduleData inData) {
+        return scheduleMapper.getCalendarId(inData);
+    }
+
 
 }