xiongchao 3 years ago
parent
commit
89d63cb009

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.platform.dao.enums.CheckJobStatusEnum;
 import com.platform.dao.vo.query.check.CheckJobVO;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -120,11 +121,11 @@ public class TuiCalendarUtil {
         ScheduleInfo scheduleInfo = new ScheduleInfo();
         scheduleInfo.setId(checkJobVO.getId());
         scheduleInfo.setCalendarId(checkJobVO.getStatus().toString());
-        scheduleInfo.setTitle(checkJobVO.getSbNo() + ":" + checkJobVO.getSbName() + ":" + checkJobVO.getSbLevel());
+        scheduleInfo.setTitle(checkJobVO.getSbNo() + ":" + checkJobVO.getSbName() + ":" + checkJobVO.getSbLevel() + "级");
         scheduleInfo.setBody(checkJobVO.getRequirement());
         scheduleInfo.setIsAllday(true);
         scheduleInfo.setStart(checkJobVO.getStartTime());
-        scheduleInfo.setEnd(checkJobVO.getEndTime());
+        scheduleInfo.setEnd(checkJobVO.getStartTime());// 起始时间和结束时间一样,用于前端显示
         scheduleInfo.setCategory("allday");
         scheduleInfo.setDueDateClass("morning");
         setScheduleInfoColor(scheduleInfo);
@@ -144,4 +145,9 @@ public class TuiCalendarUtil {
         scheduleInfo.setRaw(raw);
         return scheduleInfo;
     }
+
+    public static void main(String[] args) {
+        LocalDate date = LocalDate.now();
+        System.out.println(date.toString());
+    }
 }

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

@@ -164,6 +164,11 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
                 // 默认维修主管看到是全部的,默认也是全部的
             }
         }
+        List<Integer> statusList = new ArrayList<Integer>();
+        statusList.add(CheckJobStatusEnum.NOT_EXECUTE.getValue());
+        statusList.add(CheckJobStatusEnum.EXECUTING.getValue());
+        statusList.add(CheckJobStatusEnum.OUT_OF_DATE.getValue());
+        model.setStatusList(statusList);
         List<CheckJobVO> voList = mapper.selectList(model);
 
         tuiCalendar.setCalendarList(TuiCalendarUtil.getCalendarInfoList());