修正任务下发启动的问题

src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskServiceImpl.java

@@ -432,6 +432,8 @@ public class TaskServiceImpl implements TaskService {
                             models.add(model);
                         }
                         break;
+                    case Constants.OBJ_TYPE_USER:
+                        break;
                 }
                 Map<String, String> idMapValues = new HashMap<>();
                 for (TaskIndValue value : values) {
@@ -587,6 +589,19 @@ public class TaskServiceImpl implements TaskService {
         Result result = null;
         TaskRule rule = taskRuleService.getById(ruleId, true);
         if (rule != null) {
+            List<Task> tasks = taskMapper.getByRuleIdAndValueTime(ruleId, valueTime, false);
+            if (CollectionUtils.isNotEmpty(tasks)) {
+                boolean found = false;
+                for (Task t : tasks) {
+                    if (t.getStatus() == Constants.APPLY_STATE_DRAFT || t.getStatus() == Constants.APPLY_STATE_AUDITING) {
+                        found = true;
+                    }
+                }
+                if (found) {
+                    result = Result.genFailedResult("该规则已经存在相同时间的任务在填报或者审核中");
+                }
+            }
+            if (result == null) {
                 String roleIdStr = rule.getToRoleIds();
                 if (StringUtils.isNotBlank(roleIdStr)) {
                     List<NoticeInfo> noticeInfos = new ArrayList<>();
@@ -615,7 +630,7 @@ public class TaskServiceImpl implements TaskService {
                                 Date auditEndDate = DateUtils.addDay(now, addEndDate + addAuditDate);
                                 String user = SystemUserUtil.getCurrentUser();
                                 List<Task> allTasks = new ArrayList<>();
-                            for (String dept : deptMapInds.keys()) {
+                                for (String dept : deptMapInds.keySet()) {
                                     List<TaskIndicator> tis = deptMapInds.get(dept);
                                     List<RoleRefUserModel> refUsers = deptUsers.get(dept);
                                     if (CollectionUtils.isEmpty(refUsers)) {
@@ -657,8 +672,8 @@ public class TaskServiceImpl implements TaskService {
                                             noticeInfo.setCreateTime(now);
                                             noticeInfo.setCreator(user);
                                             noticeInfo.setDetail("您有新的数据填报任务：" +
-                                                task.getRuleName() + "-[" +task.getId()+ "]");
-                                        noticeInfo.setTitle("您有新的数据填报任务：" + task.getRuleName() );
+                                                    task.getRuleName() + "-[" + task.getId() + "]");
+                                            noticeInfo.setTitle("您有新的数据填报任务：" + task.getRuleName());
                                             noticeInfo.setToUserId(um.getId());
                                             noticeInfo.setIsRead(false);
                                             noticeInfo.setState(Constants.DATA_STATE_A);
@@ -671,15 +686,17 @@ public class TaskServiceImpl implements TaskService {
                                         allTasks.add(task);
                                     }
                                 }
-                            if (result != null && !allTasks.isEmpty()) {
+                                if (result == null) {
+                                    if (!allTasks.isEmpty()) {
                                         this.batchCreateTask(allTasks, valueTime, ruleId);
                                         rule.setLastActiveTime(now);
                                         taskRuleService.updateRuleWithInd(rule);
                                         noticeInfoService.createNotices(noticeInfos);
                                         result = Result.genOkResult();
-                            } else if (result != null) {
+                                    } else {
                                         result = Result.genFailedResult("规则配置没有生成可用的任务信息");
                                     }
+                                }
                             } else {
                                 result = Result.genFailedResult("规则配置的指标没有可用的数据项");
                             }
@@ -692,6 +709,7 @@ public class TaskServiceImpl implements TaskService {
                 } else {
                     result = Result.genFailedResult("规则没有配置对应的下发对象");
                 }
+            }
         } else {
             result = Result.genFailedResult("规则不存在");
         }

src/main/resources/mybatis/mapping/NoticeInfoMapper.xml

@@ -8,7 +8,7 @@
         values
         <foreach collection="notices" item="nt" separator=",">
             (
-              #{nt.titile}, #{nt.detail}, #{nt.isRead}, #{nt.toUser}, #{nt.state},
+              #{nt.title}, #{nt.detail}, #{nt.isRead}, #{nt.toUserId}, #{nt.state},
             #{nt.creator},#{nt.updater}, #{nt.createTime}, #{nt.updateTime}
             )
         </foreach>