feature 增加 车间促进员和安全管理员

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

@@ -1,7 +1,6 @@
 package com.rongwei.sfcommon.sys.service.impl;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.thread.ExecutorBuilder;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwe.scentity.domian.AspCheckDiscoveryItemDo;
@@ -33,7 +32,6 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.concurrent.ThreadPoolExecutor;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -84,10 +82,10 @@ public class SaveCheckItemServiceImpl implements SaveCheckItemService {
             log.error("通过id:{}无法获取到日常检查信息", id);
             return R.ok();
         }
-        if ("2".equals(checkItemDo.getSaved())) {
-            log.error("当前日常检查已生成任务.");
-            return R.ok();
-        }
+//        if ("2".equals(checkItemDo.getSaved())) {
+//            log.error("当前日常检查已生成任务.");
+//            return R.ok();
+//        }
         ThemeCheckDo themeCheck = themeCheckService.getById(checkItemDo.getThemecheckid());
         if (themeCheck == null) {
             log.error("无法通过ID：{}获取asp_theme_check", checkItemDo.getThemecheckid());
@@ -135,7 +133,7 @@ public class SaveCheckItemServiceImpl implements SaveCheckItemService {
         List<String> deptIdList = aspCheckDiscoveryItemDos.stream().map(AspCheckDiscoveryItemDo::getDeptid).filter(StringUtils::isNotBlank).distinct().collect(Collectors.toList());
         // 获取安全管理员
         SysUserDo safetyManager = saveCheckCommonDao.getSafetyManager();
-        // 获取部门安全促进员
+        // 获取车间安全促进员
         List<UserMailOrgVo> safetyPromoter = saveCheckCommonDao.getSafetyPromoter(deptIdList);
         // 获取安全管理员
         List<HiddenDangerTrackDo> addList = new ArrayList<>();
@@ -179,13 +177,12 @@ public class SaveCheckItemServiceImpl implements SaveCheckItemService {
             hiddenDangerTrack.setRectificationfund(info.getRectificationfund());
             hiddenDangerTrack.setMeasure(info.getMeasure());
             UserMailOrgVo userMailOrgVo = safetyPromoter.stream().filter(data -> data.getOrgId().equals(info.getDeptid())).findFirst().orElse(null);
-            if (userMailOrgVo == null) {
-                hiddenDangerTrack.setSafetypromoter(safetyManager == null ? "" : safetyManager.getName());
-                hiddenDangerTrack.setSafetypromoterid(safetyManager == null ? "" : safetyManager.getId());
-            } else {
-                hiddenDangerTrack.setSafetypromoter(userMailOrgVo.getName());
-                hiddenDangerTrack.setSafetypromoterid(userMailOrgVo.getId());
-            }
+            // 车间促进员
+            hiddenDangerTrack.setShopfacilitator(userMailOrgVo == null ? "" : userMailOrgVo.getName());
+            hiddenDangerTrack.setShopfacilitatorid(userMailOrgVo == null ? "" : userMailOrgVo.getId());
+            // 安全管理员
+            hiddenDangerTrack.setSafetypromoter(safetyManager == null ? "" : safetyManager.getName());
+            hiddenDangerTrack.setSafetypromoterid(safetyManager == null ? "" : safetyManager.getId());
             addList.add(hiddenDangerTrack);
         });
         hiddenDangerTrackService.saveBatch(addList);