设备子系统———大修任务提醒字典以及时间字段显示问题修复

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquOverhaulPlanningTasksServiceImpl.java

@@ -15,6 +15,7 @@ import com.rongwei.bsentity.domain.EquOverhaulPlanningTasksDo;
 import com.rongwei.bsentity.domain.EquOverhaulPlanningTasksVo;
 import com.rongwei.rwadmincommon.system.domain.SysConfigFilesDo;
 import com.rongwei.rwadmincommon.system.domain.SysDictDo;
+import com.rongwei.rwadmincommon.system.service.SysDictService;
 import com.rongwei.rwadmincommon.system.vo.SysOrganizationVo;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
@@ -59,10 +60,14 @@ public class EquOverhaulPlanningTasksServiceImpl extends ServiceImpl<EquOverhaul
     private EquipmentSendNotifyService equipmentSendNotifyService;
 
     @Autowired
-    EquOverhaulPlanningTasksMapperDao equOverhaulPlanningTasksMapperDao;
+    private EquOverhaulPlanningTasksMapperDao equOverhaulPlanningTasksMapperDao;
 
     @Autowired
     private CommonDao commonDao;
+
+    @Autowired
+    private SysDictService sysDictService;
+
     @Override
     public R importEquOverhaulPlanningTasks(MultipartFile file) {
         try {
@@ -149,6 +154,8 @@ public class EquOverhaulPlanningTasksServiceImpl extends ServiceImpl<EquOverhaul
     public R sendPlanTaskNotify(HttpServletResponse response) {
         // 临时文件夹路径
         Path tempDir = Paths.get("/upload_files/file_system");
+        List<SysDictDo> taskByType = sysDictService.getDictsByType("task_state");
+        List<SysDictDo> ynByType = sysDictService.getDictsByType("srm_yn");
         List<EquOverhaulPlanningTasksVo> equOverhaulPlanningTasksDos = equOverhaulPlanningTasksMapperDao.selectAllOverdueTaskQuantity();
         for (EquOverhaulPlanningTasksVo planningTasksVo:equOverhaulPlanningTasksDos){
             if (planningTasksVo.getTaskquantity()>0){
@@ -159,6 +166,26 @@ public class EquOverhaulPlanningTasksServiceImpl extends ServiceImpl<EquOverhaul
                     Map<String, Object> dataMap = new HashMap<>(16);
                     List<Map<String,Object>> dataList = new ArrayList<>();
                     for (EquOverhaulPlanningTasksVo equLubricationTaskDetailVo : tasksVos) {
+                        String taskStatus = "";
+                        if (org.apache.commons.lang.StringUtils.isNotBlank(equLubricationTaskDetailVo.getTaskstatus())) {
+                            taskStatus = taskByType.stream().filter(dictDo -> equLubricationTaskDetailVo.getTaskstatus().contains(dictDo.getValue()))
+                                    .map(SysDictDo::getName).collect(Collectors.joining(","));
+                            equLubricationTaskDetailVo.setTaskstatus(taskStatus);
+                        }
+                        String isHaltRepair = "";
+                        if (org.apache.commons.lang.StringUtils.isNotBlank(equLubricationTaskDetailVo.getIshaltrepair())) {
+                            isHaltRepair = ynByType.stream().filter(dictDo -> equLubricationTaskDetailVo.getIshaltrepair().contains(dictDo.getValue()))
+                                    .map(SysDictDo::getName).collect(Collectors.joining(","));
+                            equLubricationTaskDetailVo.setIshaltrepair(isHaltRepair);
+                        }
+                        String isOutSourcing = "";
+                        if (org.apache.commons.lang.StringUtils.isNotBlank(equLubricationTaskDetailVo.getIsoutsourcing())) {
+                            isOutSourcing = ynByType.stream().filter(dictDo -> equLubricationTaskDetailVo.getIsoutsourcing().contains(dictDo.getValue()))
+                                    .map(SysDictDo::getName).collect(Collectors.joining(","));
+                            equLubricationTaskDetailVo.setIsoutsourcing(isOutSourcing);
+                        }
+                        equLubricationTaskDetailVo.setShowPlanStartTime(TimeUtils.month2DateStr(equLubricationTaskDetailVo.getPlanstarttime()));
+                        equLubricationTaskDetailVo.setShowPlanEndTime(TimeUtils.month2DateStr(equLubricationTaskDetailVo.getPlanendtime()));
                         dataList.add(JSONObject.parseObject(JSONObject.toJSONString(equLubricationTaskDetailVo), Map.class));
                     }
                     dataMap.put("list",dataList);

cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/domain/EquOverhaulPlanningTasksVo.java

@@ -14,5 +14,15 @@ public class EquOverhaulPlanningTasksVo extends EquOverhaulPlanningTasksDo imple
      */
     private Integer taskquantity;
 
+    /**
+     * 计划开始时间显示
+     */
+    private String showPlanStartTime;
+
+    /**
+     * 计划结束时间显示
+     */
+    private String showPlanEndTime;
+
 
 }

cx-equipment/cx-equipment-server/src/main/java/com/rongwei/bsserver/sys/controller/EquOverhaulPlanningTasksController.java

@@ -70,6 +70,6 @@ public class EquOverhaulPlanningTasksController {
             log.info(e.getMessage());
             return R.error(e.getMessage());
         }
-    };
+    }
 }