Merge remote-tracking branch 'origin/master'

bs-common/src/main/java/com/rongwei/safecommon/utils/SaveConstans.java

@@ -484,7 +484,7 @@ public class SaveConstans {
         /**
          * 跟踪状态
          */
-        public static final String TRACK_STATUS = "track_status";
+        public static final String HIDDEN_DANGER_STATUS = "hidden_danger_status";
     }
 
 

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

@@ -24,5 +24,5 @@ public interface EquLubricationTaskManagementService extends IService<EquLubrica
      */
     void wordExportLubricationTask(Map<String, Object> parameter, HttpServletResponse response);
 
-    List<EquLubricationTaskManagementDo> getListByTimeQuantum(String newDate, String oldDate);
+    List<EquLubricationTaskManagementDo> getListByTimeQuantum(int year, int month ,boolean stride);
 }

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

@@ -19,5 +19,5 @@ public interface EquMaintenanceTaskService extends IService<EquMaintenanceTaskDo
 
     List<EquMaintenanceTaskDo> getListByYearAndMonth(int year, int month);
 
-    List<EquMaintenanceTaskDo> getListByTimeQuantum(String newDate, String oldDate);
+    List<EquMaintenanceTaskDo> getListByTimeQuantum(int year, int month,boolean stride);
 }

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

@@ -100,12 +100,24 @@ public class EquLubricationTaskManagementServiceImpl extends ServiceImpl<EquLubr
     }
 
     @Override
-    public List<EquLubricationTaskManagementDo> getListByTimeQuantum(String newDate, String oldDate) {
+    public List<EquLubricationTaskManagementDo> getListByTimeQuantum(int year, int month, boolean stride) {
         LambdaQueryWrapper<EquLubricationTaskManagementDo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(EquLubricationTaskManagementDo::getTaskstatus, Arrays.asList(10,20,70))
-                .lt(BaseDo::getCreatedate,newDate)
-                .gt(BaseDo::getCreatedate,oldDate)
+                // .lt(BaseDo::getCreatedate, year)
+                // .gt(BaseDo::getCreatedate, month)
                 .eq(BaseDo::getDeleted,0);
+
+        //跨月
+        queryWrapper.and(stride,query ->query
+                .eq(EquLubricationTaskManagementDo::getYear,year)
+                .lt(EquLubricationTaskManagementDo::getMonth,month)
+                .or()
+                .eq(EquLubricationTaskManagementDo::getYear,year-1)
+                .ge(EquLubricationTaskManagementDo::getMonth,month));
+        //月末
+        queryWrapper.and(!stride,query -> query
+                .eq(EquLubricationTaskManagementDo::getYear,year)
+                .eq(EquLubricationTaskManagementDo::getMonth,month));
         return lubricationTaskManagementMapperDao.selectList(queryWrapper);
     }
 }

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

@@ -65,12 +65,21 @@ public class EquMaintenanceTaskServiceImpl extends ServiceImpl<EquMaintenanceTas
     }
 
     @Override
-    public List<EquMaintenanceTaskDo> getListByTimeQuantum(String newDate, String oldDate) {
+    public List<EquMaintenanceTaskDo> getListByTimeQuantum(int year, int month, boolean stride) {
         LambdaQueryWrapper<EquMaintenanceTaskDo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(EquMaintenanceTaskDo::getTaskstate, Arrays.asList("10","30","70"))
-                .lt(EquMaintenanceTaskDo::getCreatedate,newDate)
-                .ge(EquMaintenanceTaskDo::getCreatedate,oldDate)
                 .eq(EquMaintenanceTaskDo::getDeleted,0);
+        //跨月
+        queryWrapper.and(stride,query ->query
+                        .eq(EquMaintenanceTaskDo::getPlanyear,year)
+                        .lt(EquMaintenanceTaskDo::getMonth,month)
+                        .or()
+                        .eq(EquMaintenanceTaskDo::getPlanyear,year-1)
+                        .ge(EquMaintenanceTaskDo::getMonth,month));
+        //月末
+        queryWrapper.and(!stride,query -> query
+                .eq(EquMaintenanceTaskDo::getPlanyear,year)
+                .eq(EquMaintenanceTaskDo::getMonth,month));
         return maintenanceTaskDao.selectList(queryWrapper);
     }
 }

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

@@ -26,6 +26,7 @@ import com.rongwei.rwcommoncomponent.file.service.SysFileItemService;
 import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
 import com.rongwei.safecommon.fegin.CXCommonFeginClient;
 import com.rongwei.safecommon.utils.CXCommonUtils;
+import com.rongwei.safecommon.utils.SaveConstans;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -334,7 +335,7 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
 
         // 3.消息提醒
         // 3.1发送人  取车间维修主管、设备部部长、设备部维修主管 角色中所有人员
-         List<String> userId = equMaintenanceOrderService.selectRoleList(Arrays.asList(WMS,EDMS, EDMS));
+         List<String> userId = equMaintenanceOrderService.selectRoleList(Arrays.asList(WMS,HOED, EDMS));
         if (userId.isEmpty()) {
             log.info("车间维修主管、设备部部长、设备部维修主管角色无提醒人");
             return R.ok();
@@ -361,15 +362,17 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
         Calendar calendar = Calendar.getInstance();
         Date date = new Date();
         calendar.setTime(date);
+        int month = calendar.get(Calendar.MONTH)+1;
+        int year = calendar.get(Calendar.YEAR);
         calendar.set(Calendar.DAY_OF_MONTH,1);
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String newDate = simpleDateFormat.format(calendar.getTime());
-        calendar.set(Calendar.MONTH, -11);
-        String oldDate = simpleDateFormat.format(calendar.getTime());
+        // calendar.set(Calendar.MONTH, -11);
+        // String oldDate = simpleDateFormat.format(calendar.getTime());
         // 查询距近一年时间内未完成保养/润滑任务
-        List<EquMaintenanceTaskDo> maintenanceTaskDoList = maintenanceTaskService.getListByTimeQuantum(newDate, oldDate);
+        List<EquMaintenanceTaskDo> maintenanceTaskDoList = maintenanceTaskService.getListByTimeQuantum(year, month, true);
         List<EquLubricationTaskManagementDo> lubricationTaskManagementDoList = equLubricationTaskManagementService
-                .getListByTimeQuantum(newDate, oldDate);
+                .getListByTimeQuantum(year, month,true );
         if (maintenanceTaskDoList.size() + lubricationTaskManagementDoList.size() == 0) {
             return R.ok();
         }
@@ -431,8 +434,8 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
             }
 
 
-            CXCommonUtils.sendNotify(noticeId, PREVIOUS_UNFINISHED_TASK_TITLE, context, plantId, userIdList.stream().distinct().collect(Collectors.toList()),
-                    fileItemId, PREVIOUS_UNFINISHED_TASK, true);
+            CXCommonUtils.sendNotify(noticeId, PREVIOUS_UNFINISHED_TASK_TITLE, context,fileItemId , userIdList.stream().distinct().collect(Collectors.toList()),
+                    plantId, PREVIOUS_UNFINISHED_TASK, true);
         }
 
         return R.ok();
@@ -447,13 +450,15 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         calendar.setTime(date);
         String newDate = simpleDateFormat.format(date);
-        // int sky = calendar.get(Calendar.DAY_OF_MONTH)-1;
-        calendar.set(Calendar.DAY_OF_MONTH, 1);
-        String oldDate = simpleDateFormat.format(calendar.getTime());
+        // // int sky = calendar.get(Calendar.DAY_OF_MONTH)-1;
+        // calendar.set(Calendar.DAY_OF_MONTH, 1);
+        // String oldDate = simpleDateFormat.format(calendar.getTime());
+        int year = calendar.get(Calendar.YEAR);
+        int month = calendar.get(Calendar.MONTH)+1;
         // 查询距近一年时间内未完成保养/润滑任务
-        List<EquMaintenanceTaskDo> maintenanceTaskDoList = maintenanceTaskService.getListByTimeQuantum(newDate, oldDate);
+        List<EquMaintenanceTaskDo> maintenanceTaskDoList = maintenanceTaskService.getListByTimeQuantum(year, month, false);
         List<EquLubricationTaskManagementDo> lubricationTaskManagementDoList = equLubricationTaskManagementService
-                .getListByTimeQuantum(newDate, oldDate);
+                .getListByTimeQuantum(year, month, false );
         if (maintenanceTaskDoList.size() + lubricationTaskManagementDoList.size() == 0) {
             return R.ok();
         }
@@ -500,7 +505,7 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
 
             byte[] byteArray = byteArrayOutputStream.toByteArray();
 
-            MultipartFile multipartFile = new MockMultipartFile("file", newDate + "-保养/润滑月末未完成.xlsx", "application/vnd.ms-excel", byteArray);
+            MultipartFile multipartFile = new MockMultipartFile("file", newDate + "-保养/润滑月末未完成.xlsx", SaveConstans.ContentType.XLSX, byteArray);
 
             // 消息提醒id
             String noticeId = SecurityUtil.getUUID();
@@ -512,8 +517,8 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
                 fileItemId = jsonObject.get("filename").toString() + "-;-" + jsonObject.get("id").toString();
                 ;
             }
-            CXCommonUtils.sendNotify(noticeId, END_UNFINISHED_TASK_TITLE, context, plantId, userIdList.stream().distinct().collect(Collectors.toList()),
-                    fileItemId, END_UNFINISHED_TASK, true);
+            CXCommonUtils.sendNotify(noticeId, END_UNFINISHED_TASK_TITLE, context,fileItemId , userIdList.stream().distinct().collect(Collectors.toList()),
+                    plantId, END_UNFINISHED_TASK, true);
         }
 
         return R.ok();

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/SafeCheckSendNotifyServiceImpl.java

@@ -1,10 +1,5 @@
 package com.rongwei.sfcommon.sys.service.impl;
 
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.rongwe.scentity.domian.HiddenDangerTrackDo;
 import com.rongwe.scentity.domian.ThemeCheckDo;
@@ -18,7 +13,6 @@ import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.safecommon.utils.CXCommonUtils;
 import com.rongwei.safecommon.utils.ExportExceByEasyExcel;
-import com.rongwei.safecommon.utils.SaveConstans;
 import com.rongwei.sfcommon.sys.dao.DangerousDao;
 import com.rongwei.sfcommon.sys.dao.SaveCheckCommonDao;
 import com.rongwei.sfcommon.sys.service.SafeCheckSendNotifyService;
@@ -27,11 +21,8 @@ import com.rongwei.sfcommon.sys.service.ThemeCheckService;
 import com.rongwei.sfcommon.sys.service.ThemeCheckWorkparkService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.ByteArrayOutputStream;
 import java.text.SimpleDateFormat;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
@@ -46,8 +37,7 @@ import static com.rongwei.safecommon.utils.SaveConstans.FileSuffix.XLSX;
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyContent.*;
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyTitle.*;
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyType.*;
-import static com.rongwei.safecommon.utils.SaveConstans.RoleCode.EDMS;
-import static com.rongwei.safecommon.utils.SaveConstans.RoleCode.HOED;
+import static com.rongwei.safecommon.utils.SaveConstans.RoleCode.*;
 import static com.rongwei.sfcommon.utils.MlConstants.DANGER_SOURCE_POINTCHECK;
 
 /**
@@ -353,7 +343,7 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
         }
         // 获取数据字典
         List<SysDictDo> dicts = sysDictService.list(new LambdaQueryWrapper<SysDictDo>().eq(BaseDo::getDeleted, "0").in(SysDictDo::getDicttype,
-                TASK_SOURCE_TYPE, HIDDEN_DANGER_TYPE, TRACK_STATUS));
+                TASK_SOURCE_TYPE, HIDDEN_DANGER_TYPE, HIDDEN_DANGER_STATUS));
         hiddenDangerTrackDos.forEach(info -> {
             if (StringUtils.isNotBlank(info.getDangersource())) {
                 info.setDangersource(dicts.stream().filter(dict -> TASK_SOURCE_TYPE.equals(dict.getDicttype()) &&
@@ -368,7 +358,7 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
             }
 
             if (StringUtils.isNotBlank(info.getStatus())) {
-                info.setStatus(dicts.stream().filter(dict -> TRACK_STATUS.equals(dict.getDicttype()) &&
+                info.setStatus(dicts.stream().filter(dict -> HIDDEN_DANGER_STATUS.equals(dict.getDicttype()) &&
                                 info.getStatus().equals(dict.getValue())).map(SysDictDo::getName)
                         .collect(Collectors.joining(",")));
             }
@@ -405,7 +395,7 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
             // 生产 根据 隐患地点 取对应部门车间的 车间主任、车间维修主管 角色中人员
             List<String> orgId = dangerTrackDos.stream().map(HiddenDangerTrackDo::getDangerworkpark).distinct().collect(Collectors.toList());
             if(!orgId.isEmpty()){
-                recipientIds.addAll(saveCheckCommonDao.getUserIdByRoleCodeAndOrgIdAndTenantId(Arrays.asList(HOED, EDMS), orgId, tenantId));
+                recipientIds.addAll(saveCheckCommonDao.getUserIdByRoleCodeAndOrgIdAndTenantId(Arrays.asList(WMS, LCZG), orgId, tenantId));
             }
             // 整改状态为“待整改”记录中的 指派跟踪人
             recipientIds.addAll(dangerTrackDos.stream().filter(info -> "20".equals(info.getStatus()))
@@ -421,12 +411,14 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
         // 附件生成
         List<ExportHiddenDangerVo> exportData = dangerTrackDos.stream().map((data) -> {
             ExportHiddenDangerVo exportHiddenDangerVo = new ExportHiddenDangerVo();
-            exportHiddenDangerVo.setTenantId(COMPANY_MAP.get( data.getTenantid()));
+            exportHiddenDangerVo.setTenantId(COMPANY_MAP.get(data.getTenantid()));
             exportHiddenDangerVo.setStatus(data.getStatus());
             exportHiddenDangerVo.setCode(data.getCode());
             exportHiddenDangerVo.setHiddendangertype(data.getHiddendangertype());
             exportHiddenDangerVo.setHiddendangercontent(data.getHiddendangercontent());
             exportHiddenDangerVo.setTrackusername(data.getTrackusername());
+            exportHiddenDangerVo.setFindUser(data.getFindusername());
+            exportHiddenDangerVo.setFindDate(data.getFindtime() == null ? "" : simpleDateFormat.format(data.getFindtime()));
             exportHiddenDangerVo.setRectificationdate(data.getRectificationdate() == null ? "" : simpleDateFormat.format(data.getRectificationdate()));
             exportHiddenDangerVo.setCompletionschedule(data.getCompletionschedule());
             exportHiddenDangerVo.setFinishdate(data.getFinishdate() == null ? "" : simpleDateFormat.format(data.getFinishdate()));

cx-safe-check/cx-save-check-entity/src/main/java/com/rongwe/scentity/vo/ExportHiddenDangerVo.java

@@ -29,19 +29,25 @@ public class ExportHiddenDangerVo {
     @ExcelProperty(value = "隐患内容", index = 4)
     private String hiddendangercontent;
 
-    @ExcelProperty(value = "指派跟踪人", index = 5)
+    @ExcelProperty(value = "发现时间", index = 5)
+    private String findDate;
+
+    @ExcelProperty(value = "发现人", index = 6)
+    private String findUser;
+
+    @ExcelProperty(value = "指派跟踪人", index = 7)
     private String trackusername;
 
-    @ExcelProperty(value = "限整改日期", index = 6)
+    @ExcelProperty(value = "限整改日期", index = 8)
     private String rectificationdate;
 
-    @ExcelProperty(value = "措施完成进度", index = 7)
+    @ExcelProperty(value = "措施完成进度", index = 9)
     private String completionschedule;
 
-    @ExcelProperty(value = "完成日期", index = 8)
+    @ExcelProperty(value = "完成日期", index = 10)
     private String finishdate;
 
-    @ExcelProperty(value = "隐患来源", index = 9)
+    @ExcelProperty(value = "隐患来源", index = 11)
     private String dangersource;
 
 }