完善

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

@@ -15,32 +15,32 @@ import java.util.List;
  *
  */
 public class TuiCalendarUtil {
-    public static String COLOR_NOT_EXECUTE = "#9e5fff";
-    public static String COLOR_EXECUTING = "#00a9ff";
-    public static String COLOR_FINISHED = "#ff5583";
-    public static String COLOR_OUT_OF_DATE = "#03bd9e";
+    public static String COLOR_NOT_EXECUTE = "#0000FF";// 蓝色
+    public static String COLOR_EXECUTING = "#800080";// 紫色
+    public static String COLOR_FINISHED = "#008000";// 绿色
+    public static String COLOR_OUT_OF_DATE = "#FF0000";// 红色
 
     public static void setScheduleInfoColor(ScheduleInfo scheduleInfo){
         if(scheduleInfo.getCalendarId().equals(CheckJobStatusEnum.NOT_EXECUTE.getValue().toString())){
             scheduleInfo.setColor("#ffffff");
             scheduleInfo.setBgColor(COLOR_NOT_EXECUTE);
-            scheduleInfo.setDragBgColor(scheduleInfo.getBgColor());
-            scheduleInfo.setBorderColor(scheduleInfo.getBgColor());
-        }else  if(scheduleInfo.getId().equals(CheckJobStatusEnum.EXECUTING.getValue())){
+            scheduleInfo.setDragBgColor(COLOR_NOT_EXECUTE);
+            scheduleInfo.setBorderColor(COLOR_NOT_EXECUTE);
+        }else if(scheduleInfo.getId().equals(CheckJobStatusEnum.EXECUTING.getValue())){
             scheduleInfo.setColor("#ffffff");
             scheduleInfo.setBgColor(COLOR_EXECUTING);
-            scheduleInfo.setDragBgColor(scheduleInfo.getBgColor());
-            scheduleInfo.setBorderColor(scheduleInfo.getBgColor());
-        }else  if(scheduleInfo.getId().equals(CheckJobStatusEnum.FINISHED.getValue())){
+            scheduleInfo.setDragBgColor(COLOR_EXECUTING);
+            scheduleInfo.setBorderColor(COLOR_EXECUTING);
+        }else if(scheduleInfo.getId().equals(CheckJobStatusEnum.FINISHED.getValue())){
             scheduleInfo.setColor("#ffffff");
             scheduleInfo.setBgColor(COLOR_FINISHED);
-            scheduleInfo.setDragBgColor(scheduleInfo.getBgColor());
-            scheduleInfo.setBorderColor(scheduleInfo.getBgColor());
+            scheduleInfo.setDragBgColor(COLOR_FINISHED);
+            scheduleInfo.setBorderColor(COLOR_FINISHED);
         }else{
             scheduleInfo.setColor("#ffffff");
             scheduleInfo.setBgColor(COLOR_OUT_OF_DATE);
-            scheduleInfo.setDragBgColor(scheduleInfo.getBgColor());
-            scheduleInfo.setBorderColor(scheduleInfo.getBgColor());
+            scheduleInfo.setDragBgColor(COLOR_OUT_OF_DATE);
+            scheduleInfo.setBorderColor(COLOR_OUT_OF_DATE);
         }
     }
 
@@ -52,35 +52,40 @@ public class TuiCalendarUtil {
     public static List<CalendarInfo> getCalendarInfoList(){
         CalendarInfo calendarInfo = new CalendarInfo();
         calendarInfo.setId(CheckJobStatusEnum.NOT_EXECUTE.getValue().toString());
+
+        // 蓝色
         calendarInfo.setName("待接收");
         calendarInfo.setColor("#ffffff");
-        calendarInfo.setBgColor("#9e5fff");
-        calendarInfo.setDragBgColor("#9e5fff");
-        calendarInfo.setBorderColor("#9e5fff");
+        calendarInfo.setBgColor(COLOR_NOT_EXECUTE);
+        calendarInfo.setDragBgColor(COLOR_NOT_EXECUTE);
+        calendarInfo.setBorderColor(COLOR_NOT_EXECUTE);
 
         CalendarInfo calendarInfo2 = new CalendarInfo();
         calendarInfo2.setId(CheckJobStatusEnum.EXECUTING.getValue().toString());
+        // 紫色
         calendarInfo2.setName("执行中");
         calendarInfo2.setColor("#ffffff");
-        calendarInfo2.setBgColor("#00a9ff");
-        calendarInfo2.setDragBgColor("#00a9ff");
-        calendarInfo2.setBorderColor("#00a9ff");
+        calendarInfo2.setBgColor(COLOR_EXECUTING);
+        calendarInfo2.setDragBgColor(COLOR_EXECUTING);
+        calendarInfo2.setBorderColor(COLOR_EXECUTING);
 
         CalendarInfo calendarInfo3 = new CalendarInfo();
         calendarInfo3.setId(CheckJobStatusEnum.FINISHED.getValue().toString());
+        // 绿色
         calendarInfo3.setName("已完成");
         calendarInfo3.setColor("#ffffff");
         calendarInfo3.setBgColor(COLOR_FINISHED);
-        calendarInfo3.setDragBgColor(calendarInfo3.getBgColor());
-        calendarInfo3.setBorderColor(calendarInfo3.getBgColor());
+        calendarInfo3.setDragBgColor(COLOR_FINISHED);
+        calendarInfo3.setBorderColor(COLOR_FINISHED);
 
         CalendarInfo calendarInfo4 = new CalendarInfo();
         calendarInfo4.setId(CheckJobStatusEnum.OUT_OF_DATE.getValue().toString());
+        // 红色
         calendarInfo4.setName("已过期");
         calendarInfo4.setColor("#ffffff");
-        calendarInfo4.setBgColor("#03bd9e");
-        calendarInfo4.setDragBgColor("#03bd9e");
-        calendarInfo4.setBorderColor("#03bd9e");
+        calendarInfo4.setBgColor(COLOR_OUT_OF_DATE);
+        calendarInfo4.setDragBgColor(COLOR_OUT_OF_DATE);
+        calendarInfo4.setBorderColor(COLOR_OUT_OF_DATE);
 
         List<CalendarInfo> list = new ArrayList<CalendarInfo>();
         list.add(calendarInfo);
@@ -115,7 +120,7 @@ public class TuiCalendarUtil {
         ScheduleInfo scheduleInfo = new ScheduleInfo();
         scheduleInfo.setId(checkJobVO.getId());
         scheduleInfo.setCalendarId(checkJobVO.getStatus().toString());
-        scheduleInfo.setTitle(checkJobVO.getRequirement());
+        scheduleInfo.setTitle(checkJobVO.getSbNo() + ":" + checkJobVO.getSbName() + ":" + checkJobVO.getSbLevel());
         scheduleInfo.setBody(checkJobVO.getRequirement());
         scheduleInfo.setIsAllday(true);
         scheduleInfo.setStart(checkJobVO.getStartTime());

platform-dao/src/main/resources/mapper/check/CheckJobMapper.xml

@@ -181,7 +181,8 @@
             resultType="com.platform.dao.vo.query.check.CheckJobVO">
         select checkjob.*, u.real_name as checkUserName,
                sbinfo.name sbName, sbinfo.no sbNo, sbinfo.level sbLevel,
-               partinfo.name partName, standard.no standardNo, standard.name standardName,standard.level standardLevel,
+               partinfo.name partName,
+               standard.no standardNo, standard.name standardName,standard.level standardLevel,
                standard.period period, standard.period_type periodType
         from t_check_job as checkjob
         left join t_sb_info sbinfo on sbinfo.id = checkjob.sb_id

platform-rest/src/main/java/com/platform/rest/controller/report/RepairReportController.java

@@ -34,10 +34,16 @@ public class RepairReportController {
   private final RepairApplicationFormService repairApplicationFormService;
 
   /**
-   * >24小时停机次数按月统计
+   * 1：>24小时停机次数按月统计
    * 统计规则：
    *    1：非计划性维修
    *    2：报修和维修结束的时间大于24小时,即设备停机修复时间
+   *
+   * 2：设备故障次数按月统计
+   * 统计规则：
+   *    1: 非计划性维修
+   *    2: 时间不限制
+   *
    * @param dto 查询条件
    * @param year 查询年份
    * @return R
@@ -50,10 +56,14 @@ public class RepairReportController {
 
     /**
      * 1: >24小时停机次数按月统计
-     * 2: 设备故障次数按月统计
      * 统计规则：
-     *    1：非计划性维修
-     *    2：报修和维修结束的时间大于24小时,即设备停机修复时间
+     *      1：非计划性维修
+     *      2：报修和维修结束的时间大于24小时,即设备停机修复时间
+     *
+     * 2：设备故障次数按月统计
+     * 统计规则：
+     *      1: 非计划性维修
+     *      2: 时间不限制
      * @param dto 查询条件
      * @param year 查询年份
      * @return R
@@ -68,7 +78,7 @@ public class RepairReportController {
     /**
      * MTTR月统计报表
      * 统计规则：
-     *    1：所有非计划性维修
+     *    1：所有非计划性维修，且dealMinutes小于24小时的
      *    2：所有维修时间累加除以每月的次数
      * @param dto 查询条件
      * @param year 查询年份
@@ -84,7 +94,7 @@ public class RepairReportController {
      * 1: >24小时停机次数按月统计
      * 2: 设备故障次数按月统计
      * 统计规则：
-     *    1：非计划性维修
+     *    1：非计划性维修，且dealMinutes小于24小时的
      *    2：报修和维修结束的时间大于24小时,即设备停机修复时间
      * @param dto 查询条件
      * @param year 查询年份

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

@@ -156,11 +156,12 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         TuiCalendar tuiCalendar = new TuiCalendar();
         // model.setSearchStartTime(DateUtils.getFirstDayOfThisMonth());
         model.setSearchEndTime(DateUtils.getLastDayOfThisMonth());
-
-        if(SecurityUtils.isRole(SysRoleCodeEnum.Opreator.name())|| SecurityUtils.isRole(SysRoleCodeEnum.Maintenance.name())){
-            model.setCheckUserId(SecurityUtils.getUserInfo().getUserId());
-        }else if(SecurityUtils.isRole(SysRoleCodeEnum.MM.name()) ){
-            // 默认维修主管看到是全部的，默认也是全部的
+        if(model.getStandardLevel() == null){
+           if(SecurityUtils.isRole(SysRoleCodeEnum.Opreator.name())|| SecurityUtils.isRole(SysRoleCodeEnum.Maintenance.name())){
+                model.setCheckUserId(SecurityUtils.getUserInfo().getUserId());
+            }else if(SecurityUtils.isRole(SysRoleCodeEnum.MM.name()) ){
+                // 默认维修主管看到是全部的，默认也是全部的
+            }
         }
         List<CheckJobVO> voList = mapper.selectList(model);
 

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -712,14 +712,14 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         searchEndTime = DateUtils.getLastDayOfMonth(month);
 
         // 选择非计划性的订单
-        if(type == 1){
+       // if(type == 1){
             repairApplicationFormDTO.setCategory(RepairApplicationFormCategoryEnum.PLAN_NOT.getValue());
-        }else if(type == 2){
+       /*}else if(type == 2){
             List<Integer> categoryList = new ArrayList<Integer>();
             categoryList.add(RepairApplicationFormCategoryEnum.PLAN_NOT.getValue());
             categoryList.add(RepairApplicationFormCategoryEnum.PLAN.getValue());
             repairApplicationFormDTO.setCategoryList(categoryList);
-        }
+        }*/
         repairApplicationFormDTO.setSearchStartTime(searchStartTime);
         repairApplicationFormDTO.setSearchEndTime(searchEndTime);
         List<RepairApplicationFormVO> list = mapper.selectPageList(repairApplicationFormDTO);
@@ -779,10 +779,10 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         searchEndTime = DateUtils.getLastDayOfMonth(month);
 
         // 选择非计划性的订单
-        List<Integer> categoryList = new ArrayList<Integer>();
-        categoryList.add(RepairApplicationFormCategoryEnum.PLAN_NOT.getValue());
-        categoryList.add(RepairApplicationFormCategoryEnum.PLAN.getValue());
-        repairApplicationFormDTO.setCategoryList(categoryList);
+        //List<Integer> categoryList = new ArrayList<Integer>();
+        //categoryList.add(RepairApplicationFormCategoryEnum.PLAN_NOT.getValue());
+        //categoryList.add(RepairApplicationFormCategoryEnum.PLAN.getValue());
+        repairApplicationFormDTO.setCategory(RepairApplicationFormCategoryEnum.PLAN_NOT.getValue());
 
         repairApplicationFormDTO.setSearchStartTime(searchStartTime);
         repairApplicationFormDTO.setSearchEndTime(searchEndTime);
@@ -796,7 +796,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             double meanMinuties = 0.0;
             int i = 0;
             for(RepairApplicationFormVO repairApplicationForm: list){
-                if(repairApplicationForm.getDealMinutes() == null){
+                if(repairApplicationForm.getDealMinutes() == null || ((repairApplicationForm.getDealMinutes()/60.0)>24.0)){
                     continue;
                 }
                 if(repairApplicationForm.getApplyTime().isAfter(map.get("searchStartTimeMonth")) && repairApplicationForm.getApplyTime().isBefore(map.get("searchEndTimeMonth"))){