完善

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

@@ -17,8 +17,8 @@ import java.util.List;
 public class TuiCalendarUtil {
     public static String COLOR_NOT_EXECUTE = "#0000FF";// 蓝色1
     public static String COLOR_OUT_OF_DATE = "#FF0000";// 红色2
-    public static String COLOR_OUT_OF_DATE2 = "#FF0080";// 浅红色4
     public static String COLOR_EXECUTING = "#800080";// 紫色3
+    public static String COLOR_OUT_OF_DATE2 = "#FF0080";// 浅红色4
     public static String COLOR_FINISHED = "#008000";// 绿色5
 
 
@@ -28,22 +28,22 @@ public class TuiCalendarUtil {
             scheduleInfo.setBgColor(COLOR_NOT_EXECUTE);
             scheduleInfo.setDragBgColor(COLOR_NOT_EXECUTE);
             scheduleInfo.setBorderColor(COLOR_NOT_EXECUTE);
-        } else if (scheduleInfo.getId().equals("2")){
+        } else if (scheduleInfo.getCalendarId().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")) {
+        } else if (scheduleInfo.getCalendarId().equals("3")) {
             scheduleInfo.setColor("#ffffff");
             scheduleInfo.setBgColor(COLOR_EXECUTING);
             scheduleInfo.setDragBgColor(COLOR_EXECUTING);
             scheduleInfo.setBorderColor(COLOR_EXECUTING);
-        } else if (scheduleInfo.getId().equals("4")) {
+        } else if (scheduleInfo.getCalendarId().equals("4")) {
             scheduleInfo.setColor("#ffffff");
             scheduleInfo.setBgColor(COLOR_OUT_OF_DATE2);
             scheduleInfo.setDragBgColor(COLOR_OUT_OF_DATE2);
             scheduleInfo.setBorderColor(COLOR_OUT_OF_DATE2);
-        }else {
+        } else {
             scheduleInfo.setColor("#ffffff");
             scheduleInfo.setBgColor(COLOR_FINISHED);
             scheduleInfo.setDragBgColor(COLOR_FINISHED);
@@ -137,22 +137,43 @@ public class TuiCalendarUtil {
     public static ScheduleInfo covertCheckJobToScheduleInfo(CheckJobVO checkJobVO) {
         ScheduleInfo scheduleInfo = new ScheduleInfo();
         scheduleInfo.setId(checkJobVO.getId());
-        if (checkJobVO.getStatus().equals(CheckJobStatusEnum.NOT_EXECUTE.getValue()) && (checkJobVO.getReceiveOvertime() == null || !checkJobVO.getReceiveOvertime())) {
-            scheduleInfo.setCalendarId("1");
-        }
-        if (checkJobVO.getStatus().equals(CheckJobStatusEnum.NOT_EXECUTE.getValue()) && (checkJobVO.getReceiveOvertime() != null && checkJobVO.getReceiveOvertime())) {
-            scheduleInfo.setCalendarId("2");
-        }
-        if (checkJobVO.getStatus().equals(CheckJobStatusEnum.EXECUTING.getValue()) && (checkJobVO.getReceiveOvertime() == null || !checkJobVO.getReceiveOvertime())) {
-            scheduleInfo.setCalendarId("3");
-        }
-        if (checkJobVO.getStatus().equals(CheckJobStatusEnum.EXECUTING.getValue()) && (checkJobVO.getReceiveOvertime() != null && checkJobVO.getReceiveOvertime())) {
-            scheduleInfo.setCalendarId("4");
-        }
         if (checkJobVO.getStatus().equals(CheckJobStatusEnum.FINISHED.getValue())) {
             scheduleInfo.setCalendarId("5");
+        } else {
+            if (checkJobVO.getStatus().equals(CheckJobStatusEnum.NOT_EXECUTE.getValue())) {
+                if(checkJobVO.getReceiveOvertime()){
+                    scheduleInfo.setCalendarId("2");
+                }else{
+                    scheduleInfo.setCalendarId("1");
+                }
+            }else if (checkJobVO.getStatus().equals(CheckJobStatusEnum.EXECUTING.getValue())) {
+                if (checkJobVO.getReceiveOvertime()) {
+                    scheduleInfo.setCalendarId("4");
+                } else {
+                    scheduleInfo.setCalendarId("3");
+                }
+            }else{
+                System.out.println("状态：" + checkJobVO.getStatus() );
+            }
         }
-        scheduleInfo.setTitle(checkJobVO.getSbNo() + ":" + checkJobVO.getSbName() + ":" + checkJobVO.getStandardLevel() + "级");
+       String period = "天";
+        if(checkJobVO.getPeriodType().equals(1)){
+            period = "天";
+        }else if(checkJobVO.getPeriodType().equals(2)){
+            period = "周";
+        }else if(checkJobVO.getPeriodType().equals(3)){
+            period = "月";
+        }else if(checkJobVO.getPeriodType().equals(4)){
+            period = "季度";
+        }else if(checkJobVO.getPeriodType().equals(5)){
+            period = "年";
+        }else if(checkJobVO.getPeriodType().equals(6)){
+            period = "公里";
+        }else{
+            period = "台时";
+        }
+        scheduleInfo.setTitle(checkJobVO.getSbNo() + ":" + checkJobVO.getSbName() + ":" + checkJobVO.getStandardLevel() + "级"+ ":" + checkJobVO.getPeriod() + period);
+
         scheduleInfo.setBody(checkJobVO.getRequirement());
         scheduleInfo.setIsAllday(true);
         scheduleInfo.setStart(checkJobVO.getStartTime());

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

@@ -143,6 +143,7 @@
         </if>
         <if test="keyword != null and keyword != ''">
             and (
+            standard.no like concat('%',#{keyword},'%') or
             sbinfo.name like concat('%',#{keyword},'%') or
             sbinfo.no like concat('%',#{keyword},'%') )
         </if>
@@ -188,6 +189,7 @@
         <if test="actualUser != null and actualUser != ''">
             and checkjob.actual_user like concat('%',#{actualUser},'%')
         </if>
+
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.check.CheckJobDTO"
             resultType="com.platform.dao.vo.query.check.CheckJobVO">

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

@@ -132,7 +132,7 @@ checkstandard.last_date,
             and checkstandard.update_time = #{updateTime}
         </if>
         <if test="keyword != null and keyword != ''">
-            and checkstandard.name like concat('%',#{keyword},'%')
+            and (checkstandard.name like concat('%',#{keyword},'%') or checkstandard.no like concat('%',#{keyword},'%') )
         </if>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.check.CheckStandardDTO"

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairApplicationFormController.java

@@ -257,32 +257,29 @@ public class RepairApplicationFormController {
         List<ExportRepairApplicationFormVO> excelList = BeanConverterUtil.copyListProperties(list, ExportRepairApplicationFormVO.class);
         List<ExportRepairApplicationFormMergeVO> mergeVOList = new ArrayList<>();
         for (ExportRepairApplicationFormVO vo : excelList) {
-            if(vo.getChangeRepairPlan()){
-                ExportRepairApplicationFormMergeVO mergeVO = BeanConverterUtil.copyObjectProperties(vo, ExportRepairApplicationFormMergeVO.class);
+            ExportRepairApplicationFormMergeVO mergeVO = BeanConverterUtil.copyObjectProperties(vo, ExportRepairApplicationFormMergeVO.class);
+
+            if(vo.getChangeRepairPlan() != null && vo.getChangeRepairPlan()){
                 mergeVO.setChangeRepairPlan("更新维修计划");
                 mergeVO.setChangeRepairPlanContent(vo.getChangeRepairPlanContent());
                 mergeVOList.add(mergeVO);
             }
-            if(vo.getChangeSparePlan()){
-                ExportRepairApplicationFormMergeVO mergeVO = BeanConverterUtil.copyObjectProperties(vo, ExportRepairApplicationFormMergeVO.class);
+            if(vo.getChangeSparePlan() != null && vo.getChangeSparePlan()){
                 mergeVO.setChangeRepairPlan("更新备件计划");
                 mergeVO.setChangeRepairPlanContent(vo.getChangeSparePlanContent());
                 mergeVOList.add(mergeVO);
             }
-            if(vo.getUserTeach()){
-                ExportRepairApplicationFormMergeVO mergeVO = BeanConverterUtil.copyObjectProperties(vo, ExportRepairApplicationFormMergeVO.class);
+            if(vo.getUserTeach() != null && vo.getUserTeach() ){
                 mergeVO.setChangeRepairPlan("人员培训");
                 mergeVO.setChangeRepairPlanContent(vo.getUserTeachContent());
                 mergeVOList.add(mergeVO);
             }
-            if(vo.getSbChange()){
-                ExportRepairApplicationFormMergeVO mergeVO = BeanConverterUtil.copyObjectProperties(vo, ExportRepairApplicationFormMergeVO.class);
+            if(vo.getSbChange() != null && vo.getSbChange()){
                 mergeVO.setChangeRepairPlan("设备改造升级");
                 mergeVO.setChangeRepairPlanContent(vo.getSbChangeContent());
                 mergeVOList.add(mergeVO);
             }
-            if(vo.getOtherChange()){
-                ExportRepairApplicationFormMergeVO mergeVO = BeanConverterUtil.copyObjectProperties(vo, ExportRepairApplicationFormMergeVO.class);
+            if(vo.getOtherChange() != null && vo.getOtherChange()){
                 mergeVO.setChangeRepairPlan("其他");
                 mergeVO.setChangeRepairPlanContent(vo.getOtherChangeContent());
                 mergeVOList.add(mergeVO);

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

@@ -33,6 +33,7 @@ import com.platform.dao.vo.report.CheckJobReportWeekHoursVO;
 import com.platform.dao.vo.report.RepairReport24VO;
 import com.platform.dao.vo.report.RepairReportMttr;
 import com.platform.dao.vo.sb.SbInfoVO;
+import com.platform.dao.vo.tuicalendar.ScheduleInfo;
 import com.platform.dao.vo.tuicalendar.TuiCalendar;
 import com.platform.dao.vo.tuicalendar.TuiCalendarUtil;
 import com.platform.service.base.impl.BaseServiceImpl;
@@ -168,10 +169,8 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         // model.setSearchStartTime(DateUtils.getFirstDayOfThisMonth());
         model.setSearchEndTime(DateUtils.getLastDayOfThisMonth());
         if(model.getStandardLevel() == null){
-           if(SecurityUtils.isRole(SysRoleCodeEnum.Opreator.name())|| SecurityUtils.isRole(SysRoleCodeEnum.Maintenance.name())){
+            if(!SecurityUtils.isRole(SysRoleCodeEnum.MM.name())){
                 model.setCheckUserId(SecurityUtils.getUserInfo().getUserId());
-            }else if(SecurityUtils.isRole(SysRoleCodeEnum.MM.name()) ){
-                // 默认维修主管看到是全部的，默认也是全部的
             }
         }
         /*List<Integer> statusList = new ArrayList<Integer>();
@@ -182,6 +181,9 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
 
         tuiCalendar.setCalendarList(TuiCalendarUtil.getCalendarInfoList());
         tuiCalendar.setScheduleList(TuiCalendarUtil.covertCheckJobToScheduleInfoList(voList));
+        for(ScheduleInfo scheduleInfo:tuiCalendar.getScheduleList()){
+            System.out.println("scheduleInfo.getCalendarId(): " + scheduleInfo.getCalendarId());
+        }
         return tuiCalendar;
     }