演练需求变动 代码提交

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/dto/CoreEduTrainingTaskEditDto.java

@@ -6,7 +6,6 @@ import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTaskToUser;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -14,7 +13,6 @@ import java.util.List;
 public class CoreEduTrainingTaskEditDto {
 
 
-    @NotNull
     @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
     private Long id;
 
@@ -62,4 +60,5 @@ public class CoreEduTrainingTaskEditDto {
     @ApiModelProperty(value = "任务用户信息", notes = "缺席人员")
     private List<CoreEduTrainingTaskToUser> absentList;
 
+    private String title;
 }

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/vo/CoreEduTrainingTaskPageVo.java

@@ -47,11 +47,11 @@ public class CoreEduTrainingTaskPageVo {
     private String hostName;
 
 
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "任务计划开始日期")
     private Date startDate;
 
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "任务计划截止日期")
     private Date endDate;
 

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

@@ -284,11 +284,6 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             coreDrillTask.setOrgPath(sysOrg.getPath());
             coreDrillTask.setTitle(request.getTitle());
             coreDrillTask.setPlanCycle(DrillPlanCycleEnum.NONE.getCode());
-            if (ObjectUtil.isNotEmpty(request.getFileList())) {
-                coreDrillTask.setFileList(JSON.toJSONString(request.getFileList()));
-            } else {
-                coreDrillTask.setFileList(null);
-            }
             coreDrillTask.setCreateBy(SecurityUtils.getUserId().toString());
             coreDrillTask.setCreateTime(new Date());
 
@@ -302,6 +297,11 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         coreDrillTask.setDrillSituation(request.getDrillSituation());
         coreDrillTask.setRecorderId(SecurityUtils.getUserId());
         coreDrillTask.setImageList(request.getImageList());
+        if (ObjectUtil.isNotEmpty(request.getFileList())) {
+            coreDrillTask.setFileList(JSON.toJSONString(request.getFileList()));
+        } else {
+            coreDrillTask.setFileList(null);
+        }
         CoreDrillTask finalCoreDrillTask = coreDrillTask;
         List<SysUser> userList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
                 roleService.selectUserByRoleNameAndOrgId("网点负责人", finalCoreDrillTask.getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_USER_DATA_ERROR);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -292,7 +292,24 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     @Transactional(rollbackFor = Exception.class)
     public int updateCoreEduTrainingTask(CoreEduTrainingTaskEditDto request) {
         CoreEduTrainingTask coreEduTrainingTask = coreEduTrainingTaskMapper.selectById(request.getId());
-        taskToUserMapper.deleteByMap(MapUtil.of("edu_training_task_id", request.getId()));
+        boolean isAdd = false;
+        if (coreEduTrainingTask==null){
+            isAdd = true;
+            SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() ->
+                            orgService.selectOrgById(SecurityUtils.getLoginUser().getSysUser().getOrgId(), SecurityConstants.INNER),
+                    ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+            coreEduTrainingTask=new CoreEduTrainingTask();
+            coreEduTrainingTask.setId(IdWorker.getId());
+            coreEduTrainingTask.setOrgId(sysOrg.getId());
+            coreEduTrainingTask.setOrgName(sysOrg.getShortName());
+            coreEduTrainingTask.setOrgPath(sysOrg.getPath());
+            coreEduTrainingTask.setTitle(request.getTitle());
+            coreEduTrainingTask.setTrainingStartDateTime(request.getTrainingStartDateTime());
+            coreEduTrainingTask.setTrainingEndDateTime(request.getTrainingStartDateTime());
+            coreEduTrainingTask.setPlanCycle(EduTrainingPlanCycleEnum.NONE.getCode());
+            coreEduTrainingTask.setCreateBy(SecurityUtils.getUserId().toString());
+            coreEduTrainingTask.setCreateTime(new Date());
+        }
         coreEduTrainingTask.setType(request.getType());
         coreEduTrainingTask.setTrainingStartDateTime(request.getTrainingStartDateTime());
         coreEduTrainingTask.setTrainingEndDateTime(request.getTrainingEndDateTime());
@@ -311,7 +328,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         if (ObjectUtil.isNotEmpty(taskUserList)) {
             checkTheSameUser(taskUserList);
             for (CoreEduTrainingTaskToUser taskToUser : taskUserList) {
-                taskToUser.setEduTrainingTaskId(request.getId());
+                taskToUser.setEduTrainingTaskId(coreEduTrainingTask.getId());
                 taskToUser.setSign(0);
             }
             coreEduTrainingTaskToUserService.saveBatch(taskUserList);
@@ -327,6 +344,9 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         coreEduTrainingTask.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
         coreEduTrainingTask.setUpdateTime(DateUtils.getNowDate());
 
+        if (isAdd){
+            return coreEduTrainingTaskMapper.insert(coreEduTrainingTask);
+        }
         return coreEduTrainingTaskMapper.updateById(coreEduTrainingTask);
     }