提交预案演练任务相关对象

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

@@ -56,12 +56,12 @@ public class CoreDrillTask extends BaseEntity {
 
 
     @TableField("title")
-    @ApiModelProperty(value = "学习主题")
+    @ApiModelProperty(value = "演练任务主题")
     private String title;
 
 
     /**
-     * @see com.xunmei.common.core.enums.edu.EduTrainingType
+     * @see com.xunmei.common.core.enums.drill.DrillType
      * 类型
      */
     @TableField("type")
@@ -69,7 +69,7 @@ public class CoreDrillTask extends BaseEntity {
     private Integer type;
 
     @TableField("host_id")
-    @ApiModelProperty(value = "主持人")
+    @ApiModelProperty(value = "指挥人")
     private Long hostId;
 
     @TableField("recorder_id")
@@ -88,32 +88,42 @@ public class CoreDrillTask extends BaseEntity {
     private Date endDate;
 
 
-    @TableField("training_start_date_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "培训开始时间")
-    private LocalDateTime trainingStartDateTime;
+//    @TableField("training_start_date_time")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @ApiModelProperty(value = "培训开始时间")
+//    private LocalDateTime trainingStartDateTime;
+//
+//    @TableField("training_end_date_time")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @ApiModelProperty(value = "培训截止时间")
+//    private LocalDateTime trainingEndDateTime;
 
-    @TableField("training_end_date_time")
+    @TableField("drill_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "培训截止时间")
-    private LocalDateTime trainingEndDateTime;
+    @ApiModelProperty(value = "演练时间")
+    private LocalDateTime drillTime;
+
+    @TableField("drill_site")
+    @ApiModelProperty(value = "演练地点")
+    private String drillSite;
+
 
     /**
-     * @see com.xunmei.common.core.enums.edu.EduTrainingDoStatus
+     * @see com.xunmei.common.core.enums.drill.DrillDoStatus
      */
     @TableField("status")
     @ApiModelProperty(value = "状态")
     private Integer status;
 
 
-    @TableField("content")
-    @ApiModelProperty(value = "内容")
-    private String content;
+    @TableField("preset_case")
+    @ApiModelProperty(value = "预设案由")
+    private String presetCase;
 
 
-    @TableField("note")
-    @ApiModelProperty(value = "总结")
-    private String note;
+    @TableField("drill_situation")
+    @ApiModelProperty(value = "演练情况")
+    private String drillSituation;
 
 
     @TableField("plan_cycle")
@@ -134,6 +144,21 @@ public class CoreDrillTask extends BaseEntity {
     @ApiModelProperty(value = "pdf下载地址")
     private String pdfUrl;
 
+    @TableField("comment_score")
+    @ApiModelProperty(value = "评分")
+    private String commentScore;
+
+    @TableField("comment")
+    @ApiModelProperty(value = "评语")
+    private String comment;
+
+    @TableField("comment_id")
+    @ApiModelProperty(value = "评价人id")
+    private String commentId;
+
+    @TableField("comment_time")
+    @ApiModelProperty(value = "评价时间")
+    private String commentTime;
 
     @Override
     public String toString() {
@@ -142,11 +167,11 @@ public class CoreDrillTask extends BaseEntity {
                 .append("planId", getPlanId())
                 .append("startDate", getStartDate())
                 .append("endDate", getEndDate())
-                .append("content", getContent())
+                .append("presetCase", getPresetCase())
+                .append("drillSituation", getDrillSituation())
                 .append("title", getTitle())
-                .append("note", getNote())
-                .append("trainingStartDateTime", getTrainingStartDateTime())
-                .append("trainingEndDateTime", getTrainingEndDateTime())
+                .append("drillTime", getDrillTime())
+                .append("drillSite", getDrillSite())
                 .append("hostId", getHostId())
                 .append("fileList", getFileList())
                 .append("imageList", getImageList())
@@ -159,6 +184,10 @@ public class CoreDrillTask extends BaseEntity {
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
+                .append("commentScore", getCommentScore())
+                .append("comment", getComment())
+                .append("commentId", getCommentId())
+                .append("commentTime", getCommentTime())
                 .toString();
     }
 }

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

@@ -1,5 +1,6 @@
 package com.xunmei.common.core.domain.drill.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.xunmei.common.core.domain.drill.domain.CoreDrillTaskToUser;
@@ -19,27 +20,38 @@ public class CoreDrillTaskEditDto {
     private Long id;
 
     /**
-     * @see com.xunmei.common.core.enums.edu.DrillType
+     * @see com.xunmei.common.core.enums.drill.DrillType
      * 类型
      */
     @ApiModelProperty(value = "类型")
     private Integer type;
 
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @ApiModelProperty(value = "培训开始时间")
+//    private LocalDateTime trainingStartDateTime;
+//
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @ApiModelProperty(value = "培训截止时间")
+//    private LocalDateTime trainingEndDateTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "培训开始时间")
-    private LocalDateTime trainingStartDateTime;
+    @ApiModelProperty(value = "演练时间")
+    private LocalDateTime drillTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "培训截止时间")
-    private LocalDateTime trainingEndDateTime;
 
 
-    @ApiModelProperty(value = "内容")
-    private String content;
+    @ApiModelProperty(value = "演练地点")
+    private String drillSite;
+
+//
+//    @ApiModelProperty(value = "总结")
+//    private String note;
+
+    @ApiModelProperty(value = "预设案由")
+    private String presetCase;
 
 
-    @ApiModelProperty(value = "总结")
-    private String note;
+    @ApiModelProperty(value = "演练情况")
+    private String drillSituation;
 
     @ApiModelProperty(value = "图片")
     private String imageList;

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

@@ -12,7 +12,7 @@ import java.util.Date;
 public class CoreDrillTaskPageDto extends PageRequest {
 
 
-    @ApiModelProperty(value = "学习主题")
+    @ApiModelProperty(value = "演练任务标题")
     private String title;
 
     @ApiModelProperty(value = "类型")

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillTaskPageVo.java

@@ -18,7 +18,7 @@ public class CoreDrillTaskPageVo {
     @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
     private Long id;
 
-    @ApiModelProperty(value = "教育培训计划Id")
+    @ApiModelProperty(value = "预案演练计划Id")
     private Long planId;
 
     @ApiModelProperty(value = "机构")
@@ -27,7 +27,7 @@ public class CoreDrillTaskPageVo {
     @ApiModelProperty(value = "机构名称")
     private String orgName;
 
-    @ApiModelProperty(value = "学习主题")
+    @ApiModelProperty(value = "演练任务主题")
     private String title;
 
     /**
@@ -40,12 +40,15 @@ public class CoreDrillTaskPageVo {
     @ApiModelProperty(value = "类型名称")
     private String typeText;
 
-    @ApiModelProperty(value = "主持人")
+    @ApiModelProperty(value = "指挥人")
     private Long hostId;
 
-    @ApiModelProperty(value = "主持人名称")
+    @ApiModelProperty(value = "指挥人名称")
     private String hostName;
 
+    @ApiModelProperty(value = "演练地点")
+    private String drillSite;
+
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "任务计划开始日期")
@@ -55,15 +58,6 @@ public class CoreDrillTaskPageVo {
     @ApiModelProperty(value = "任务计划截止日期")
     private Date endDate;
 
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "培训开始时间")
-    private Date trainingStartDateTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "培训开始时间")
-    private Date trainingEndDateTime;
-
     /**
      * @see com.xunmei.common.core.enums.drill.DrillDoStatus
      */
@@ -83,4 +77,10 @@ public class CoreDrillTaskPageVo {
 
     @ApiModelProperty(value = "签名情况", notes = "已签名人数/总人数")
     private String signNums;
+
+    @ApiModelProperty(value = "评分")
+    private String commentScore;
+
+    @ApiModelProperty(value = "评语")
+    private String comment;
 }

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

@@ -10,9 +10,13 @@ import java.util.Map;
 @AllArgsConstructor
 public enum DrillDoStatus {
 
-    WAIT_RECORDED(0, "待记录"),
+    WAIT_RECORDED(0, "待演练"),
     WAIT_SIGN(1, "待签名"),
-    DONE(2, "已完成"),
+
+    WAIT_COMMENT(2, "待评价"),
+    DONE(3, "已完成"),
+
+    OVERDUE(4, "已逾期"),
 
 
     ;

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

@@ -7,7 +7,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
- * 教育培训类型
+ * 预案演练类型
  */
 
 @Getter

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/controller/CoreDrillTaskController.java

@@ -30,7 +30,7 @@ import java.util.Date;
  */
 @Api(tags = {"CoreDrillTask"})
 @RestController
-@RequestMapping("/drillTask")
+@RequestMapping("/drill/task")
 public class CoreDrillTaskController extends BaseController {
     @Autowired
     private ICoreDrillTaskService coreDrillTaskService;
@@ -105,6 +105,6 @@ public class CoreDrillTaskController extends BaseController {
     @ApiOperation(value = "生成任务")
     @GetMapping(value = "/buildEduTask")
     AjaxResult buildEduTask(@RequestParam(required = false, value = "cycle") Integer cycle, @RequestParam(required = false, value = "date") Date date) {
-        return success(coreDrillTaskService.buildEduTask(cycle, date));
+        return success(coreDrillTaskService.buildDrillTask(cycle, date));
     }
 }

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

@@ -90,7 +90,7 @@ public interface ICoreDrillTaskService extends IService<CoreDrillTask> {
 
     AjaxResult buildEduPdf(Long id);
 
-    String buildEduTask(Integer cycle, Date date);
+    String buildDrillTask(Integer cycle, Date date);
 
     List<CoreDrillTaskToUser> signUserList(Long taskId);
 }

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

@@ -205,12 +205,12 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
     @Override
     public int updateCoreDrillTask(CoreDrillTaskEditDto request) {
         CoreDrillTask coreDrillTask = coreDrillTaskMapper.selectById(request.getId());
-        taskToUserMapper.deleteByMap(MapUtil.of("edu_training_task_id", request.getId()));
+        taskToUserMapper.deleteByMap(MapUtil.of("drill_task_id", request.getId()));
         coreDrillTask.setType(request.getType());
-        coreDrillTask.setTrainingStartDateTime(request.getTrainingStartDateTime());
-        coreDrillTask.setTrainingEndDateTime(request.getTrainingEndDateTime());
-        coreDrillTask.setContent(request.getContent());
-        coreDrillTask.setNote(request.getNote());
+        coreDrillTask.setDrillTime(request.getDrillTime());
+        coreDrillTask.setDrillSite(request.getDrillSite());
+        coreDrillTask.setPresetCase(request.getPresetCase());
+        coreDrillTask.setDrillSituation(request.getDrillSituation());
         coreDrillTask.setRecorderId(SecurityUtils.getUserId());
         coreDrillTask.setImageList(request.getImageList());
         //主持人默认取网点负责人,具体还没落实,暂时处理成这样   TODO
@@ -301,13 +301,14 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 trainingTask.setId(IdWorker.getId());
                 trainingTask.setPlanId(plan.getId());
                 trainingTask.setPlanCycle(plan.getPlanCycle());
+                trainingTask.setTitle(plan.getPlanName());
                 trainingTask.setStartDate(start);
                 trainingTask.setEndDate(end);
-                trainingTask.setContent(null);
-                trainingTask.setTitle(plan.getPlanName());
-                trainingTask.setNote(null);
-                trainingTask.setTrainingStartDateTime(null);
-                trainingTask.setTrainingEndDateTime(null);
+                trainingTask.setPresetCase(null);
+                trainingTask.setDrillSituation(null);
+
+                trainingTask.setDrillTime(null);
+                trainingTask.setDrillSite(null);
                 trainingTask.setFileList(ObjectUtil.isEmpty(plan.getFileList()) ? null : JSON.toJSONString(plan.getFileList()));
                 trainingTask.setImageList(null);
                 trainingTask.setOrgId(org.getId());
@@ -318,6 +319,8 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 trainingTask.setPdfUrl(null);
                 trainingTask.setCreateTime(new Date());
                 trainingTask.setUpdateTime(new Date());
+                trainingTask.setComment(null);
+
                 taskList.add(trainingTask);
                 for (CoreDrillPlanToRole planToRole : planRoleList) {
                     CoreDrillTaskToRole coreDrillTaskToRole = new CoreDrillTaskToRole();
@@ -436,7 +439,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         List<SysOrg> sysOrgList = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgByIdList(list, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         String orgName = sysOrgList.stream().map(SysOrg::getName).collect(Collectors.joining("_"));
 
-        String fileName = orgName + "_" + ExportPdfType.EDUCATION_TRAINING.getText() + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".pdf";
+        String fileName = orgName + "_" + ExportPdfType.SAFETY_DRILL.getText() + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".pdf";
         Map<String, Object> data = this.getFtlEdu(task);
         data.put("fileName", fileName);
         data.put("id", id);
@@ -517,7 +520,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
     }
 
     @Override
-    public String buildEduTask(Integer cycle, Date date) {
+    public String buildDrillTask(Integer cycle, Date date) {
         if (ObjectUtil.isNull(date)) {
             date = new Date();
         }