完善

platform-dao/src/main/java/com/platform/dao/vo/tuicalendar/TuiCalendarUtil.java

@@ -23,26 +23,31 @@ public class TuiCalendarUtil {
 
 
     public static void setScheduleInfoColor(ScheduleInfo scheduleInfo) {
-        if (scheduleInfo.getCalendarId().equals(CheckJobStatusEnum.NOT_EXECUTE.getValue().toString())) {
+        if (scheduleInfo.getCalendarId().equals("1")) {
             scheduleInfo.setColor("#ffffff");
             scheduleInfo.setBgColor(COLOR_NOT_EXECUTE);
             scheduleInfo.setDragBgColor(COLOR_NOT_EXECUTE);
             scheduleInfo.setBorderColor(COLOR_NOT_EXECUTE);
-        } else if (scheduleInfo.getId().equals(CheckJobStatusEnum.EXECUTING.getValue())) {
+        } else if (scheduleInfo.getId().equals("2")){
+            scheduleInfo.setColor("#ffffff");
+            scheduleInfo.setBgColor(COLOR_OUT_OF_DATE);
+            scheduleInfo.setDragBgColor(COLOR_OUT_OF_DATE);
+            scheduleInfo.setBorderColor(COLOR_OUT_OF_DATE);
+        } else if (scheduleInfo.getId().equals("3")) {
             scheduleInfo.setColor("#ffffff");
             scheduleInfo.setBgColor(COLOR_EXECUTING);
             scheduleInfo.setDragBgColor(COLOR_EXECUTING);
             scheduleInfo.setBorderColor(COLOR_EXECUTING);
-        } else if (scheduleInfo.getId().equals(CheckJobStatusEnum.FINISHED.getValue())) {
+        } else if (scheduleInfo.getId().equals("4")) {
+            scheduleInfo.setColor("#ffffff");
+            scheduleInfo.setBgColor(COLOR_OUT_OF_DATE2);
+            scheduleInfo.setDragBgColor(COLOR_OUT_OF_DATE2);
+            scheduleInfo.setBorderColor(COLOR_OUT_OF_DATE2);
+        }else {
             scheduleInfo.setColor("#ffffff");
             scheduleInfo.setBgColor(COLOR_FINISHED);
             scheduleInfo.setDragBgColor(COLOR_FINISHED);
             scheduleInfo.setBorderColor(COLOR_FINISHED);
-        } else {
-            scheduleInfo.setColor("#ffffff");
-            scheduleInfo.setBgColor(COLOR_OUT_OF_DATE);
-            scheduleInfo.setDragBgColor(COLOR_OUT_OF_DATE);
-            scheduleInfo.setBorderColor(COLOR_OUT_OF_DATE);
         }
     }
 
@@ -147,7 +152,7 @@ public class TuiCalendarUtil {
         if (checkJobVO.getStatus().equals(CheckJobStatusEnum.FINISHED.getValue())) {
             scheduleInfo.setCalendarId("5");
         }
-        scheduleInfo.setTitle(checkJobVO.getSbNo() + ":" + checkJobVO.getSbName() + ":" + checkJobVO.getSbLevel() + "级");
+        scheduleInfo.setTitle(checkJobVO.getSbNo() + ":" + checkJobVO.getSbName() + ":" + checkJobVO.getStandardLevel() + "级");
         scheduleInfo.setBody(checkJobVO.getRequirement());
         scheduleInfo.setIsAllday(true);
         scheduleInfo.setStart(checkJobVO.getStartTime());

platform-service/src/main/java/com/platform/service/check/impl/CheckJobServiceImpl.java

@@ -158,6 +158,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
 
     /**
      * 获取保养日历数据，日历数据默认是当前一个月的，且包括以前未完成的
+     * 已完成的不给拖动
      * @param model
      * @return
      */
@@ -173,10 +174,10 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
                 // 默认维修主管看到是全部的，默认也是全部的
             }
         }
-        List<Integer> statusList = new ArrayList<Integer>();
+        /*List<Integer> statusList = new ArrayList<Integer>();
         statusList.add(CheckJobStatusEnum.NOT_EXECUTE.getValue());
         statusList.add(CheckJobStatusEnum.EXECUTING.getValue());
-        model.setStatusList(statusList);
+        model.setStatusList(statusList);*/
         List<CheckJobVO> voList = mapper.selectList(model);
 
         tuiCalendar.setCalendarList(TuiCalendarUtil.getCalendarInfoList());