feature 解决任务没有正确生成的问题

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/ThemeCheckServiceImpl.java

@@ -170,15 +170,11 @@ public class ThemeCheckServiceImpl extends ServiceImpl<ThemeCheckDao, ThemeCheck
         JSCommonUtils.parameterCheck(() -> themeCheckDo == null, "无法通过ID 获取到检查计划", "无法通过ID 获取到检查计划", themeCheckId);
         JSCommonUtils.parameterCheck(() -> themeCheckDo.getCreatetask() != null && themeCheckDo.getCreatetask() == 1,
                 "此检查计划已生成检查任务", "此检查计划已生成检查任务");
-        Map<String, Object> queryMap = new HashMap<>();
         // 获取本次检查计划的
         List<ThemeCheckWorkparkDo> themeCheckWorkparks = themeCheckWorkparkService
                 .list(new LambdaQueryWrapper<ThemeCheckWorkparkDo>().eq(ThemeCheckWorkparkDo::getThemecheckid, themeCheckId));
         JSCommonUtils.parameterCheck(themeCheckWorkparks::isEmpty,
                 "本次计划暂无检查小组任务", "本次计划暂无检查小组任务");
-        // 获取所有检查小组的人员信息
-
-        Set<String> uniqueValuesOuter = new HashSet<>();
         // 获取检查任务中的所有人员ID
         List<String> userIds = themeCheckWorkparks.stream().map(data -> {
             String users = data.getGroupleader();
@@ -209,6 +205,8 @@ public class ThemeCheckServiceImpl extends ServiceImpl<ThemeCheckDao, ThemeCheck
         // 发送提醒的map
         Map<String, String> sendNotifyMap = new HashMap<>();
         // 生成检查任务
+        SysUserDo userDo;
+        List<CheckTemplateItemsDo> chekTempItems;
         for (ThemeCheckWorkparkDo info : themeCheckWorkparks) {
             String groupLeader = info.getGroupleader();
             String groupUsers = info.getGroupusers();
@@ -219,8 +217,6 @@ public class ThemeCheckServiceImpl extends ServiceImpl<ThemeCheckDao, ThemeCheck
             if (StringUtils.isNotBlank(groupUsers)) {
                 currentCheckUserIds.addAll(new HashSet<>(Arrays.asList(groupUsers.split(","))));
             }
-            SysUserDo userDo;
-            List<CheckTemplateItemsDo> chekTempItems;
             for (String userId : currentCheckUserIds) {
                 userDo = userList.stream().filter(user -> userId.equals(user.getId())).findFirst().orElse(null);
                 if (userDo == null) {
@@ -230,9 +226,8 @@ public class ThemeCheckServiceImpl extends ServiceImpl<ThemeCheckDao, ThemeCheck
                 // 生成检查任务主表信息
                 ThemeCheckItemDo themeCheckItemDo = generateThemeCheckItem(userDo, info, themeCheckDo);
                 saveCheckItemList.add(themeCheckItemDo);
-
                 chekTempItems = checkTemplateItemsDos.stream()
-                        .filter(data -> themeCheckItemDo.getId().equals(data.getChecktemplateid()))
+                        .filter(data -> info.getChecktemplateid().equals(data.getChecktemplateid()))
                         .collect(Collectors.toList());
                 int index = 1;
                 // 生成检查任务子表

js-security/security-entity/src/main/java/com/rongwe/scentity/domian/ThemeCheckWorkparkDo.java

@@ -72,15 +72,6 @@ public class ThemeCheckWorkparkDo extends BaseDo implements Serializable {
      * 扩展json格式配置
      */
     private String roption;
-    /**
-     * 创建人名称
-     */
-    private String createusername;
-    /**
-     * 修改人名称
-     */
-    private String modifyusername;
-
     /**
      * 检查模板ID
      */

js-security/security-server/src/main/java/com/rongwei/savecheck/controller/ThemeCheckController.java

@@ -1,19 +1,19 @@
 package com.rongwei.savecheck.controller;
 
-import java.util.List;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.rongwe.scentity.domian.ThemeCheckDo;
+import com.rongwei.rwcommon.base.QueryPar;
+import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.sfcommon.sys.service.ThemeCheckItemService;
 import com.rongwei.sfcommon.sys.service.ThemeCheckService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.rongwei.rwcommon.base.QueryPar;
-import com.rongwei.rwcommon.base.R;
-import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 专项检查和每天检查表
@@ -99,13 +99,8 @@ public class ThemeCheckController {
      */
     @PostMapping("/themeCheckSplit")
     public R themeCheckSplit(@RequestBody ThemeCheckDo themeCheckDo) {
-        try {
-            themeCheckService.sendMailByCheckId(themeCheckDo.getId());
-            return R.ok();
-        } catch (Exception e) {
-            log.error(StringUtils.spliceErrorMsg(e), e.fillInStackTrace());
-            return R.saveError();
-        }
+        themeCheckService.sendMailByCheckId(themeCheckDo.getId());
+        return R.ok();
     }
 
     /**