教育/演练计划下发撤回需求变更修改

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/dto/CoreDrillTaskEditDto.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -18,11 +19,11 @@ public class CoreDrillTaskEditDto {
 
     private String title;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "演练时间")
     private LocalDateTime drillStartTime;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "演练时间")
     private LocalDateTime drillEndTime;
 
@@ -52,10 +53,10 @@ public class CoreDrillTaskEditDto {
     private List<CoreDrillTaskToUser> taskUserList;
 
     @ApiModelProperty(value = "任务用户信息", notes = "参与人员")
-    private List<CoreDrillTaskToUser> absenceList;
+    private List<CoreDrillTaskToUser> absenceList = new ArrayList<>();
 
     @ApiModelProperty(value = "任务用户信息", notes = "缺席人员")
-    private List<CoreDrillTaskToUser> absentList;
+    private List<CoreDrillTaskToUser> absentList = new ArrayList<>();
 
     private List<String> fileList;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/drill/DrillDoStatus.java

@@ -10,7 +10,7 @@ import java.util.Map;
 @AllArgsConstructor
 public enum DrillDoStatus {
 
-    WAIT_RECORDED(0, "待演练"),
+    WAIT_RECORDED(0, "待登记"),
     WAIT_SIGN(1, "待签名"),
 
     WAIT_COMMENT(2, "待评价"),

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -126,7 +126,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             for (CoreDrillTaskPageVo record : records) {
                 dealData(record, records, null);
             }
-           // records.sort(getComparator());
+            // records.sort(getComparator());
         }
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(pageData);
@@ -287,6 +287,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                     ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
             coreDrillTask = new CoreDrillTask();
             coreDrillTask.setId(IdWorker.getId());
+            request.setId(coreDrillTask.getId());
             coreDrillTask.setOrgId(sysOrg.getId());
             coreDrillTask.setOrgName(sysOrg.getShortName());
             coreDrillTask.setOrgPath(sysOrg.getPath());
@@ -320,16 +321,8 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         } else {
             coreDrillTask.setHostId(SecurityUtils.getUserId());
         }
-        List<CoreDrillTaskToUser> taskUserList = request.getTaskUserList();
-        if (ObjectUtil.isNotEmpty(taskUserList)) {
-            coreDrillTaskToUserService.removeByMap(MapUtil.of("drill_task_id", request.getId()));
-            checkTheSameUser(taskUserList);
-            for (CoreDrillTaskToUser taskToUser : taskUserList) {
-                taskToUser.setDrillTaskId(request.getId());
-                taskToUser.setSign(0);
-            }
-            coreDrillTaskToUserService.saveBatch(taskUserList);
-        }
+        saveTaskUserData(request);
+
         if (ObjectUtil.equal(request.getSubmitType(), 2)) {
             coreDrillTask.setStatus(DrillDoStatus.WAIT_SIGN.getCode());
         } else {
@@ -345,6 +338,20 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         return coreDrillTaskMapper.updateById(coreDrillTask);
     }
 
+    private void saveTaskUserData(CoreDrillTaskEditDto request) {
+        List<CoreDrillTaskToUser> taskUserList = request.getTaskUserList();
+        if (ObjectUtil.isEmpty(taskUserList)) {
+            taskUserList = Stream.of(request.getAbsenceList(), request.getAbsentList()).flatMap(Collection::stream).collect(Collectors.toList());
+        }
+        coreDrillTaskToUserService.removeByMap(MapUtil.of("drill_task_id", request.getId()));
+        checkTheSameUser(taskUserList);
+        for (CoreDrillTaskToUser taskToUser : taskUserList) {
+            taskToUser.setDrillTaskId(request.getId());
+            taskToUser.setSign(0);
+        }
+        coreDrillTaskToUserService.saveBatch(taskUserList);
+    }
+
     private void checkTheSameUser(List<CoreDrillTaskToUser> taskUserList) {
         Map<Integer, List<CoreDrillTaskToUser>> listMap = taskUserList.stream().collect(Collectors.groupingBy(CoreDrillTaskToUser::getType));
         List<CoreDrillTaskToUser> userList = listMap.get(1);
@@ -930,7 +937,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             list.addAll(waitEvaluateTaskList);
         }
         Date now = new Date();
-        list.removeIf(item->now.before(item.getStartTime()) || now.after(item.getEndTime()));
+        list.removeIf(item -> now.before(item.getStartTime()) || now.after(item.getEndTime()));
         list.forEach(item -> {
             item.setType(PanelTypeEnums.DRILL.getCode());
         });
@@ -959,7 +966,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             });
         }
         Date now = new Date();
-        waitRecTaskList.removeIf(item->now.before(item.getStartTime()) || now.after(item.getEndTime()));
+        waitRecTaskList.removeIf(item -> now.before(item.getStartTime()) || now.after(item.getEndTime()));
         waitRecTaskList.forEach(item -> {
             item.setType(PanelTypeEnums.DRILL_REC.getCode());
         });
@@ -978,7 +985,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 .stream().collect(Collectors.toMap(SysDictData::getDictValue, v -> v));
         List<Long> taskIds = list.stream().map(x -> x.getId()).collect(Collectors.toList());
         List<CoreDrillTaskToUser> allTaskUserList = taskToUserMapper.selectList(new LambdaQueryWrapper<CoreDrillTaskToUser>().in(CoreDrillTaskToUser::getDrillTaskId, taskIds));
-        int index=1;
+        int index = 1;
         for (CoreDrillTaskExportVo task : list) {
             task.setIndex(index);
             index++;