bugFix 缺少发现人发现时间以及跟踪状态不正确的问题

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-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;
@@ -353,7 +344,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 +359,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(",")));
             }
@@ -421,12 +412,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.getFinishdate() == 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;
 
 }