Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

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/CoreDrillPlanDetailDto.java

@@ -1,8 +0,0 @@
-package com.xunmei.common.core.domain.drill.vo;
-
-/**
- * @author jingyuanchao
- * @date 2023/9/8 21:21
- */
-public class CoreDrillPlanDetailDto {
-}

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

@@ -0,0 +1,58 @@
+package com.xunmei.common.core.domain.drill.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author jingyuanchao
+ * @date 2023/9/8 21:21
+ */
+@Data
+public class CoreDrillPlanDetailVo {
+    @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty(value = "计划名称")
+    private String planName;
+
+    @ApiModelProperty(value = "计划周期")
+    private Integer planCycle;
+
+    @ApiModelProperty(value = "执行次数")
+    private Integer execTimes;
+
+    @ApiModelProperty(value = "计划开始时间")
+    private Date startDate;
+    @ApiModelProperty(value = "计划结束时间")
+    private Date endDate;
+
+    @ApiModelProperty(value = "计划状态")
+    private int planStatus;
+
+    @ApiModelProperty(value = "是否立即生效", notes = "0:否,1:是")
+    private Boolean buildTaskNow = Boolean.FALSE;
+
+    @ApiModelProperty(value = "培训机构类型")
+    private Integer execOrgType;
+
+    @Size(min = 1, message = "计划培训角色")
+    @ApiModelProperty(value = "计划执行角色")
+    private List<Long> planRoleId;
+
+    @ApiModelProperty(value = "计划执行机构id")
+    private List<Long> planExecOrgIdList;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "附件")
+    private List<String> fileList;
+
+    @ApiModelProperty(value = "登记簿url")
+    private String pdfUrl;
+}

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

@@ -64,6 +64,9 @@ public class CoreDrillPlanPageVo {
     @ApiModelProperty(value = "是否由顶级机构创建", notes = "0:否 1:是")
     private int createByTopOrg;
 
+    @ApiModelProperty(value = "标准机构下发的计划所生成任务是否存在已完成的任务", notes = "1:存在, 0/null:不存在")
+    private Integer done;
+
     private String planRoleNameList;
 
 

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/CoreDrillPlanController.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.drill.controller;
 
+import com.xunmei.common.core.domain.drill.dto.CoreDrillPlanInsertDto;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillPlanPageDto;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillPlanUpdateDto;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanPageVo;
@@ -67,7 +68,7 @@ public class CoreDrillPlanController extends BaseController {
     @RequiresPermissions("core:drillPlan:add")
     @Log(title = "预案演练计划" , businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CoreDrillPlan coreDrillPlan) {
+    public AjaxResult add(@RequestBody @Validated CoreDrillPlanInsertDto coreDrillPlan) {
         return toAjax(coreDrillPlanService.insertCoreDrillPlan(coreDrillPlan));
     }
 
@@ -88,8 +89,8 @@ public class CoreDrillPlanController extends BaseController {
     @ApiOperation(value = "删除CoreDrillPlan")
     @RequiresPermissions("core:drillPlan:remove")
     @Log(title = "预案演练计划" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
+    @DeleteMapping("/{id}")
+    public AjaxResult remove(@PathVariable Long ids) {
         return toAjax(coreDrillPlanService.deleteCoreDrillPlanByIds(ids));
     }
 }

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/mapper/CoreDrillPlanMapper.java

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.domain.drill.domain.CoreDrillPlan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillPlanPageDto;
+import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanDataVo;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanPageVo;
+import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanRoleVo;
 import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingPlanPageDto;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanPageVo;
 import org.apache.ibatis.annotations.Param;
@@ -69,4 +71,10 @@ public interface CoreDrillPlanMapper extends BaseMapper<CoreDrillPlan> {
     Page<CoreDrillPlanPageVo> selectPageData(Page<CoreDrillPlanPageVo> pageRequest, @Param("request") CoreDrillPlanPageDto request);
 
     List<CoreDrillPlanPageVo> selectChildrenPlan(@Param("request") CoreDrillPlanPageDto request);
+
+    CoreDrillPlanDataVo getDetailPlanData(@Param("id") Long id);
+
+    List<Long> selectIdByParentId(@Param("planId") Long planId);
+
+    List<CoreDrillPlanRoleVo> selectPlanRole(@Param("orgId") Long orgId);
 }

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

@@ -2,11 +2,18 @@ package com.xunmei.core.drill.service;
 
 import java.util.List;
 
+import com.xunmei.common.core.domain.IdName;
 import com.xunmei.common.core.domain.drill.domain.CoreDrillPlan;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.domain.drill.dto.CoreDrillPlanInsertDto;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillPlanPageDto;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillPlanUpdateDto;
+import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanDataVo;
+import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanDetailVo;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanPageVo;
+import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanRoleVo;
+import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanDataVo;
+import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanRoleVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
 
 /**
@@ -22,7 +29,7 @@ public interface ICoreDrillPlanService extends IService<CoreDrillPlan> {
      * @param id 预案演练计划主键
      * @return 预案演练计划
      */
-     CoreDrillPlan selectCoreDrillPlanById(Long id);
+    CoreDrillPlanDetailVo selectCoreDrillPlanById(Long id);
 
     /**
      * 查询预案演练计划列表
@@ -38,7 +45,7 @@ public interface ICoreDrillPlanService extends IService<CoreDrillPlan> {
      * @param coreDrillPlan 预案演练计划
      * @return 结果
      */
-    int insertCoreDrillPlan(CoreDrillPlan coreDrillPlan);
+    int insertCoreDrillPlan(CoreDrillPlanInsertDto coreDrillPlan);
 
     /**
      * 修改预案演练计划
@@ -54,7 +61,7 @@ public interface ICoreDrillPlanService extends IService<CoreDrillPlan> {
      * @param ids 需要删除的预案演练计划主键集合
      * @return 结果
      */
-    int deleteCoreDrillPlanByIds(Long[] ids);
+    int deleteCoreDrillPlanByIds(Long ids);
 
     /**
      * 删除预案演练计划信息
@@ -71,4 +78,13 @@ public interface ICoreDrillPlanService extends IService<CoreDrillPlan> {
      * @return Page
      */
     TableDataInfo<CoreDrillPlanPageVo> selectPage(CoreDrillPlanPageDto coreDrillPlan);
+
+    CoreDrillPlanDataVo getCoreDrillPlanDataVo(Long id);
+
+    List<CoreDrillPlanRoleVo> listPlanRole(Long orgId);
+
+    void publishPlan(Long planId);
+
+    List<IdName<String, String>> planList(Long orgId);
+
 }

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/CoreDrillPlanServiceImpl.java

@@ -1,33 +1,31 @@
 package com.xunmei.core.drill.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.xunmei.common.core.constant.ErrorMsgConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
-import com.xunmei.common.core.domain.drill.domain.CoreDrillPlanToExecOrg;
-import com.xunmei.common.core.domain.drill.domain.CoreDrillPlanToRole;
+import com.xunmei.common.core.domain.IdName;
+import com.xunmei.common.core.domain.drill.domain.*;
+import com.xunmei.common.core.domain.drill.dto.CoreDrillPlanInsertDto;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillPlanPageDto;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillPlanUpdateDto;
+import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanDataVo;
+import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanDetailVo;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanPageVo;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanRoleVo;
-import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingPlan;
-import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingPlanToExecOrg;
-import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingPlanToRole;
-import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingPlanEditDto;
-import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingPlanPageDto;
-import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanPageVo;
-import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanRoleVo;
+import com.xunmei.common.core.exception.SystemException;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
-import com.xunmei.core.drill.mapper.CoreDrillPlanToExecOrgMapper;
-import com.xunmei.core.drill.mapper.CoreDrillPlanToRoleMapper;
+import com.xunmei.core.drill.mapper.*;
 import com.xunmei.core.drill.service.ICoreDrillPlanToExecOrgService;
 import com.xunmei.core.drill.service.ICoreDrillPlanToRoleService;
+import com.xunmei.core.drill.service.ICoreDrillTaskService;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
@@ -35,17 +33,18 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
-import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.core.drill.mapper.CoreDrillPlanMapper;
-import com.xunmei.common.core.domain.drill.domain.CoreDrillPlan;
 import com.xunmei.core.drill.service.ICoreDrillPlanService;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionSynchronizationAdapter;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 /**
  * 预案演练计划Service业务层处理
@@ -66,6 +65,14 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
     @Autowired
     private CoreDrillPlanToExecOrgMapper coreDrillPlanToExecOrgMapper;
     @Autowired
+    private ICoreDrillTaskService coreDrillTaskService;
+    @Autowired
+    private CoreDrillTaskMapper coreDrillTaskMapper;
+    @Autowired
+    private CoreDrillTaskToRoleMapper coreDrillTaskToRoleMapper;
+    @Autowired
+    private CoreDrillTaskToUserMapper coreDrillTaskToUserMapper;
+    @Autowired
     private RemoteOrgService orgService;
 
     @Override
@@ -101,6 +108,10 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
             }
             child.setPlanRoleNameList(roleNameList);
         }
+        if (record.getStandard() == 1) {
+            final Integer done = coreDrillTaskMapper.checkHasTaskIsDoneByPlanParentId(record.getId());
+            record.setDone(done);
+        }
     }
 
     /**
@@ -110,8 +121,18 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
      * @return 预案演练计划
      */
     @Override
-    public CoreDrillPlan selectCoreDrillPlanById(Long id) {
-        return coreDrillPlanMapper.selectById(id);
+    public CoreDrillPlanDetailVo selectCoreDrillPlanById(Long id) {
+        final CoreDrillPlan plan = coreDrillPlanMapper.selectById(id);
+        CoreDrillPlanDetailVo vo = new CoreDrillPlanDetailVo();
+        BeanUtils.copyProperties(plan, vo);
+        vo.setFileList(ObjectUtil.isNotEmpty(plan.getFileList()) ? JSON.parseArray(plan.getFileList(), String.class) : null);
+        final List<CoreDrillPlanToExecOrg> execOrgList = coreDrillPlanToExecOrgMapper.selectByMap(MapUtil.of("plan_id", id));
+        final List<Long> execOrgIdList = execOrgList.stream().map(CoreDrillPlanToExecOrg::getOrgId).collect(Collectors.toList());
+        vo.setPlanExecOrgIdList(ObjectUtil.isEmpty(execOrgIdList) ? null : execOrgIdList);
+        final List<CoreDrillPlanToRole> planToRoles = coreDrillPlanToRoleMapper.selectByMap(MapUtil.of("plan_id", id));
+        final List<Long> execRoleIdList = planToRoles.stream().map(CoreDrillPlanToRole::getRoleId).collect(Collectors.toList());
+        vo.setPlanRoleId(ObjectUtil.isEmpty(execRoleIdList) ? null : execRoleIdList);
+        return vo;
     }
 
     /**
@@ -128,22 +149,77 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
     /**
      * 新增预案演练计划
      *
-     * @param coreDrillPlan 预案演练计划
+     * @param request 预案演练计划
      * @return 结果
      */
     @Override
-    public int insertCoreDrillPlan(CoreDrillPlan coreDrillPlan) {
-        coreDrillPlan.setCreateTime(DateUtils.getNowDate());
-        return coreDrillPlanMapper.insert(coreDrillPlan);
+    @Transactional(rollbackFor = Exception.class)
+    public int insertCoreDrillPlan(CoreDrillPlanInsertDto request) {
+        if (ObjectUtil.isAllEmpty(request.getExecOrgType(), request.getPlanExecOrgIdList())) {
+            throw new RuntimeException("培训机构类型和执行机构不能同时为空!");
+        }
+        if (ObjectUtil.equal(request.getPlanCycle(), 0) && ObjectUtil.hasEmpty(request.getStartDate(), request.getEndDate())) {
+            throw new RuntimeException("当计划为无周期的时候,请填入开始时间和结束时间!");
+        }
+        Long count = coreDrillPlanMapper.selectCount(new LambdaQueryWrapper<CoreDrillPlan>()
+                .eq(CoreDrillPlan::getPlanName, request.getPlanName())
+                .eq(CoreDrillPlan::getDeleted, 0));
+        if (null != count && count > 0) {
+            throw new RuntimeException("计划名称已存在!");
+        }
+        CoreDrillPlan plan = new CoreDrillPlan();
+        BeanUtils.copyProperties(request, plan);
+        plan.setId(IdWorker.getId());
+        plan.setCreateTime(new Date());
+        plan.setUpdateTime(new Date());
+        plan.setCreateBy(SecurityUtils.getUserId().toString());
+        plan.setUpdateBy(SecurityUtils.getUserId().toString());
+        plan.setBuildTaskNow(Boolean.TRUE.equals(request.getBuildTaskNow()) ? 1 : 0);
+        final Long orgId = SecurityUtils.getLoginUser().getSysUser().getOrgId();
+        SysOrg r = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgById(orgId, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+        SysOrg org = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.getSysOrgByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+        plan.setCreateOrgId(orgId);
+        plan.setCreateOrgName(r.getName());
+        plan.setCreateOrgPath(r.getPath());
+        plan.setBelongOrgId(orgId);
+        plan.setBelongOrgName(r.getName());
+        plan.setBelongOrgPath(r.getPath());
+        plan.setFileList(ObjectUtil.isNotEmpty(request.getFileList()) ? JSON.toJSONString(request.getFileList()) : null);
+        batchSavePlanToRole(request.getPlanRoleId(), plan.getId());
+        batchSavePlanToExecOrg(request.getPlanExecOrgIdList(), plan.getId());
+        //省联社或者办事处创建的计划才存在下发
+        if (checkOrgType(org.getType())) {
+            plan.setStandard(1);
+            plan.setIssue(0);
+        }
+        plan.setBeIssue(0);
+        int insert = coreDrillPlanMapper.insert(plan);
+
+        //如果不是省联社或者办事处，状态启用，并且是无周期或者立即生效
+        if ((!checkOrgType(org.getType())) && ObjectUtil.equal(0, plan.getPlanStatus()) && (ObjectUtil.equal(0, plan.getPlanCycle()) || ObjectUtil.equal(1, plan.getBuildTaskNow()))) {
+            final CoreDrillPlanDataVo detailPlanData = this.getCoreDrillPlanDataVo(plan.getId());
+            coreDrillTaskService.createTaskForNow(detailPlanData, plan.getPlanStartDate(), plan.getPlanEndDate());
+        }
+
+        return insert;
+    }
+
+    private Boolean checkOrgType(Integer orgType) {
+        if (ObjectUtil.isEmpty(orgType)) {
+            throw new RuntimeException("当前用户所在机构类型无法确认!");
+        }
+        //如果是省联社或者办事处则返回1，其他机构类型返回0
+        return ObjectUtil.equal(orgType, 1) || ObjectUtil.equal(orgType, 2);
     }
 
     /**
      * 修改预案演练计划
      *
-     * @param coreDrillPlan 预案演练计划
+     * @param request 预案演练计划
      * @return 结果
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int updateCoreDrillPlan(CoreDrillPlanUpdateDto request) {
         final CoreDrillPlan plan = getById(request.getId());
         //此处判断能否修改,如果可以 需要删除任务,且还需要判断是否需要生成任务
@@ -158,21 +234,76 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         plan.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
         coreDrillPlanToRoleMapper.deleteByMap(MapUtil.of("plan_id", plan.getId()));
         coreDrillPlanToExecOrgMapper.deleteByMap(MapUtil.of("plan_id", plan.getId()));
-        List<CoreDrillPlanToRole> trainingPlanToRoleList = batchSavePlanToRole(request.getPlanRoleId(), plan.getId());
-        List<CoreDrillPlanToExecOrg> trainingPlanToExecOrgList = batchSavePlanToExecOrg(request.getPlanExecOrgIdList(), plan.getId());
+        List<CoreDrillPlanToRole> coreDrillPlanToRoleList = batchSavePlanToRole(request.getPlanRoleId(), plan.getId());
+        List<CoreDrillPlanToExecOrg> drillPlanToExecOrgList = batchSavePlanToExecOrg(request.getPlanExecOrgIdList(), plan.getId());
         final int i = coreDrillPlanMapper.updateById(plan);
         if (plan.getStandard() == 1) {
             //如果标准计划可以修改，那么需要删除所有计划与任务，重新创建计划任务
-            //    updateStandardPlan(plan, trainingPlanToRoleList, trainingPlanToExecOrgList);
+            updateStandardPlan(plan, coreDrillPlanToRoleList);
         } else {
             //普通计划
-            // updateCommonPlan(plan);
+            updateCommonPlan(plan);
         }
 
 
         return i;
     }
 
+    private void updateStandardPlan(CoreDrillPlan plan, List<CoreDrillPlanToRole> drillPlanToRoleList) {
+        //没下发的就不管
+        if (0 == plan.getIssue()) {
+            return;
+        }
+        Long planId = plan.getId();
+        //删除原有数据， 然后重新生成计划，任务
+        List<Long> planIdList = coreDrillPlanMapper.selectIdByParentId(planId);
+        if (ObjectUtil.isNotEmpty(planIdList)) {
+            coreDrillPlanMapper.deleteBatchIds(planIdList);
+            coreDrillPlanToExecOrgMapper.delete(new LambdaQueryWrapper<CoreDrillPlanToExecOrg>().in(CoreDrillPlanToExecOrg::getPlanId, planIdList));
+            coreDrillPlanToRoleMapper.delete(new LambdaQueryWrapper<CoreDrillPlanToRole>().in(CoreDrillPlanToRole::getPlanId, planIdList));
+        }
+        List<CoreDrillTask> taskIdList = coreDrillTaskMapper.selectList(new LambdaQueryWrapper<CoreDrillTask>().in(CoreDrillTask::getPlanId, planIdList).select(CoreDrillTask::getId));
+        List<Long> collect = taskIdList.stream().map(CoreDrillTask::getId).collect(Collectors.toList());
+        if (ObjectUtil.isNotEmpty(collect)) {
+            coreDrillTaskMapper.deleteBatchIds(collect);
+            coreDrillTaskToRoleMapper.delete(new LambdaQueryWrapper<CoreDrillTaskToRole>().in(CoreDrillTaskToRole::getDrillTaskId, collect));
+
+        }
+        List<CoreDrillPlan> planList = buildPlanData(plan, drillPlanToRoleList);
+
+        for (CoreDrillPlan drillPlan : planList) {
+            final CoreDrillPlanDataVo dataVo = getCoreDrillPlanDataVo(drillPlan.getId());
+            CompletableFuture.runAsync(() -> {
+                //说明有任务并且都没执行过，需要重新生成任务
+                coreDrillTaskService.createTaskForNow(dataVo, plan.getPlanStartDate(), plan.getPlanEndDate());
+            });
+        }
+    }
+
+    private void updateCommonPlan(CoreDrillPlan plan) {
+        /*
+                   判断能否修改: 如果上面返回了true; 说明两种情况
+                   1:计划生成了任务,但是未执行:  此时需要删除所有任务,修改计划数据后重新创建任务
+                   2:计划生成了任务且执行了,但是没有修改到关键信息,此时则不能删除任务,只允许修改计划信息
+
+         */
+        final Integer done = coreDrillTaskMapper.checkHasTaskIsDone(Arrays.asList(plan.getId()));
+        if (ObjectUtil.equal(1, done)) {
+            //此为情况二, 计划生成了任务且执行 不能删除任务,只允许修改计划信息,所以直接返回
+            //TODO 考虑是否同步修改已生成的任务的名称
+            return;
+        }
+        //此为情况一,计划没有生成任务或者生成了任务但未执行
+        final CoreDrillPlanDataVo dataVo = getCoreDrillPlanDataVo(plan.getId());
+        if (ObjectUtil.equal(1, plan.getBuildTaskNow()) && ObjectUtil.equal(0, plan.getPlanStatus())) {
+            coreDrillTaskMapper.deleteByMap(MapUtil.of("plan_id", plan.getId()));
+            CompletableFuture.runAsync(() -> {
+                //说明有任务并且都没执行过，需要重新生成任务
+                coreDrillTaskService.createTaskForNow(dataVo, plan.getPlanStartDate(), plan.getPlanEndDate());
+            });
+        }
+    }
+
     private Boolean checkCanUpdate(CoreDrillPlanUpdateDto request, CoreDrillPlan plan) {
         if (ObjectUtil.isAllEmpty(request.getExecOrgType(), request.getPlanExecOrgIdList())) {
             throw new RuntimeException("培训机构类型和执行机构不能同时为空!");
@@ -185,11 +316,9 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         boolean flag = true;
         //判断计划是否有任务已经执行过
         // TODO
-        //final Integer done = coreEduTrainingTaskMapper.checkHasTaskIsDone(Arrays.asList(planId));
-        final Integer done = 1;
+        final Integer done = coreDrillTaskMapper.checkHasTaskIsDone(Arrays.asList(planId));
         //判断标准计划能否修改:存在下发的计划生成了任务且任务存在已执行
-        Integer standardPlanHasDone = 1;
-        //Integer standardPlanHasDone = coreEduTrainingTaskMapper.checkHasTaskIsDoneByPlanParentId(planId);
+        Integer standardPlanHasDone = coreDrillTaskMapper.checkHasTaskIsDoneByPlanParentId(planId);
         if (standardPlanHasDone != null) {
             throw new RuntimeException("该计划下存在任务已执行的情况,无法修改!");
         }
@@ -261,12 +390,52 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
     /**
      * 批量删除预案演练计划
      *
-     * @param ids 需要删除的预案演练计划主键
+     * @param id 需要删除的预案演练计划主键
      * @return 结果
      */
     @Override
-    public int deleteCoreDrillPlanByIds(Long[] ids) {
-        return coreDrillPlanMapper.deleteBatchIds(Arrays.asList((ids)));
+    @Transactional(rollbackFor = Exception.class)
+    public int deleteCoreDrillPlanByIds(Long id) {
+        Integer count = coreDrillTaskMapper.checkHasTaskIsDone(Collections.singletonList(id));
+        if (count != null && count > 0) {
+            throw new RuntimeException("已有任务完成，无法删除");
+        }
+        final Integer done = coreDrillTaskMapper.checkHasTaskIsDoneByPlanParentId(id);
+        if (done != null && done > 0) {
+            throw new RuntimeException("已有任务完成，无法删除");
+        }
+        final CoreDrillPlan plan = getById(id);
+        if (plan.getStandard() == 0) {
+            //自建计划
+            final List<CoreDrillTask> drillTaskList = coreDrillTaskMapper.selectList(new LambdaQueryWrapper<CoreDrillTask>()
+                    .eq(CoreDrillTask::getPlanId, id)
+                    .select(CoreDrillTask::getId));
+            final List<Long> taskIdList = drillTaskList.stream().map(CoreDrillTask::getId).collect(Collectors.toList());
+            //删除任务相关
+            if (ObjectUtil.isNotEmpty(taskIdList)) {
+                coreDrillTaskMapper.deleteBatchIds(taskIdList);
+                coreDrillTaskToRoleMapper.delete(new LambdaQueryWrapper<CoreDrillTaskToRole>().in(CoreDrillTaskToRole::getDrillTaskId, taskIdList));
+            }
+            //删除计划
+            return coreDrillPlanMapper.deleteBatchIds(Collections.singletonList((id)));
+        } else {
+            //标准计划
+            List<Long> planIdList = coreDrillPlanMapper.selectIdByParentId(id);
+            if (ObjectUtil.isNotEmpty(planIdList)) {
+                //删除任务相关
+                final List<CoreDrillTask> drillTaskList = coreDrillTaskMapper.selectList(new LambdaQueryWrapper<CoreDrillTask>()
+                        .in(CoreDrillTask::getPlanId, planIdList)
+                        .select(CoreDrillTask::getId));
+                final List<Long> taskIdList = drillTaskList.stream().map(CoreDrillTask::getId).collect(Collectors.toList());
+                if (ObjectUtil.isNotEmpty(taskIdList)) {
+                    coreDrillTaskMapper.deleteBatchIds(taskIdList);
+                    coreDrillTaskToRoleMapper.delete(new LambdaQueryWrapper<CoreDrillTaskToRole>().in(CoreDrillTaskToRole::getDrillTaskId, taskIdList));
+                }
+            }
+            //删除计划
+            planIdList.add(id);
+            return coreDrillPlanMapper.deleteBatchIds(planIdList);
+        }
     }
 
     /**
@@ -279,4 +448,181 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
     public int deleteCoreDrillPlanById(Long id) {
         return coreDrillPlanMapper.deleteById(id);
     }
+
+    @Override
+    public List<CoreDrillPlanRoleVo> listPlanRole(Long orgId) {
+        if (orgId == null) {
+            SysOrg r = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectTopOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+            orgId = r.getId();
+        }
+        return coreDrillPlanMapper.selectPlanRole(orgId);
+    }
+
+    @Override
+    public void publishPlan(Long planId) {
+        final CoreDrillPlan plan = coreDrillPlanMapper.selectById(planId);
+        if (plan == null) {
+            throw new SystemException("计划不存在!");
+        }
+        if (ObjectUtil.equal(plan.getIssue(), 1)) {
+            throw new SystemException("计划已完成发布!");
+        }
+        // 下发 按钮显示逻辑:仅省联社安全保卫管理人员进入且由省联社管理安全保卫人员创建的计划才显示
+        //todo 判断当前人的角色信息
+        List<CoreDrillPlan> list = buildPlanData(plan, new ArrayList<>());
+
+        plan.setIssue(1);
+        this.updateById(plan);
+        //事务提交后执行
+        TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
+            @Override
+            public void afterCommit() {
+                for (CoreDrillPlan drillPlan : list) {
+                    CompletableFuture.runAsync(() -> {
+                        //如果不是省联社或者办事处，状态启用，并且是无周期或者立即生效
+                        if ((ObjectUtil.equal(0, plan.getPlanStatus()) && (ObjectUtil.equal(0, plan.getPlanCycle()) || ObjectUtil.equal(1, plan.getBuildTaskNow())))) {
+                            final CoreDrillPlanDataVo detailPlanData = getCoreDrillPlanDataVo(drillPlan.getId());
+                            coreDrillTaskService.createTaskForNow(detailPlanData, plan.getPlanStartDate(), plan.getPlanEndDate());
+                        }
+                    });
+                }
+            }
+        });
+
+    }
+
+    @Override
+    public CoreDrillPlanDataVo getCoreDrillPlanDataVo(Long id) {
+        final CoreDrillPlanDataVo dataVo = coreDrillPlanMapper.getDetailPlanData(id);
+        dataVo.setFileList(ObjectUtil.isNotEmpty(dataVo.getFile()) ? JSON.parseArray(dataVo.getFile(), String.class) : null);
+        return dataVo;
+    }
+
+    @Override
+    public List<IdName<String, String>> planList(Long orgId) {
+        SysOrg org = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgById(orgId, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+        final Integer orgType = org.getType();
+        switch (orgType) {
+            case 1:
+                //省联社
+                final List<CoreDrillPlan> sLsPlanList = getPlanList(orgId, 1, 1);
+                return sLsPlanList.stream().map(x -> new IdName<>(x.getId().toString(), x.getPlanName())).collect(Collectors.toList());
+            case 2:
+                //办事处
+                SysOrg topOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectTopOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+                final List<CoreDrillPlan> lsPlanList = getPlanList(topOrg.getId(), 1, 1);
+                final List<CoreDrillPlan> bscPlanList = getPlanList(orgId, 1, 1);
+                return Stream.of(lsPlanList, bscPlanList).flatMap(Collection::stream).map(x -> new IdName<>(x.getId().toString(), x.getPlanName())).collect(Collectors.toList());
+            case 3:
+                //行社
+                final List<CoreDrillPlan> hsPlanList = getPlanList(orgId, 0, 0);
+                return hsPlanList.stream().map(x -> new IdName<>(x.getId().toString(), x.getPlanName())).collect(Collectors.toList());
+            default:
+                return new ArrayList<>();
+        }
+    }
+
+    private List<CoreDrillPlan> getPlanList(Long orgId, Integer standard, Integer issue) {
+        return coreDrillPlanMapper.selectList(new LambdaQueryWrapper<CoreDrillPlan>()
+                .eq(CoreDrillPlan::getBelongOrgId, orgId)
+                .eq(CoreDrillPlan::getStandard, standard)
+                .eq(CoreDrillPlan::getIssue, issue)
+                .eq(CoreDrillPlan::getDeleted, 0)
+                .eq(CoreDrillPlan::getPlanStatus, 0)
+                .select(CoreDrillPlan::getId, CoreDrillPlan::getPlanName)
+        );
+    }
+
+    private List<CoreDrillPlan> buildPlanData(CoreDrillPlan plan, List<CoreDrillPlanToRole> planRoleList) {
+        if (ObjectUtil.isEmpty(planRoleList)) {
+            //获取执行角色
+            LambdaQueryWrapper<CoreDrillPlanToRole> ros = new LambdaQueryWrapper<>();
+            ros.eq(CoreDrillPlanToRole::getPlanId, plan.getId());
+            planRoleList = coreDrillPlanToRoleMapper.selectList(ros);
+        }
+        //获取计划具体执行机构
+        final List<SysOrg> planExecOrgList = this.getPlanExecOrg(plan);
+
+        List<Long> orgIds = null;
+        if (ObjectUtil.isNotEmpty(planExecOrgList)) {
+            orgIds = planExecOrgList.stream().map(SysOrg::getId).collect(Collectors.toList());
+        }
+
+        //获取所有行社机构
+        List<SysOrg> publishOrgList = this.getPlanPublishOrgList(plan, orgIds);
+        if (ObjectUtil.isEmpty(publishOrgList)) {
+            throw new RuntimeException("未能查询到行社数据!");
+        }
+
+        List<CoreDrillPlanToExecOrg> planToExecOrgs = new ArrayList<>();
+        List<CoreDrillPlan> list = new ArrayList<>();
+        for (SysOrg sysOrg : publishOrgList) {
+            CoreDrillPlan drillPlan = new CoreDrillPlan();
+            BeanUtils.copyProperties(plan, drillPlan);
+            drillPlan.setId(IdWorker.getId());
+            drillPlan.setBelongOrgId(sysOrg.getId());
+            drillPlan.setBelongOrgName(sysOrg.getName());
+            drillPlan.setBelongOrgPath(sysOrg.getPath());
+            drillPlan.setStandard(0);
+            drillPlan.setIssue(0);
+            drillPlan.setParentId(plan.getId());
+            drillPlan.setCreateTime(new Date());
+            drillPlan.setUpdateTime(new Date());
+            list.add(drillPlan);
+
+            if (ObjectUtil.isNotEmpty(planExecOrgList)) {
+                planExecOrgList.stream().filter(x -> x.getPath().contains(sysOrg.getPath())).forEach(y -> {
+                    CoreDrillPlanToExecOrg temp = new CoreDrillPlanToExecOrg();
+                    temp.setPlanId(drillPlan.getId());
+                    temp.setOrgId(y.getId());
+                    planToExecOrgs.add(temp);
+                });
+            }
+        }
+        if (planToExecOrgs.size() > 0) {
+            coreDrillPlanToExecOrgService.saveBatch(planToExecOrgs);
+        }
+        List<CoreDrillPlanToRole> insertPlanRoleList = new ArrayList<>();
+        for (CoreDrillPlan drillPlan : list) {
+            //保存执行角色
+            for (CoreDrillPlanToRole planRole : planRoleList) {
+                CoreDrillPlanToRole role = new CoreDrillPlanToRole();
+                role.setPlanId(drillPlan.getId());
+                role.setRoleId(planRole.getRoleId());
+                insertPlanRoleList.add(role);
+            }
+        }
+        if (list.size() > 0) {
+            this.saveBatch(list);
+        }
+        if (insertPlanRoleList.size() > 0) {
+            coreDrillPlanToRoleService.saveBatch(insertPlanRoleList);
+        }
+
+        return list;
+    }
+
+    private List<SysOrg> getPlanExecOrg(CoreDrillPlan plan) {
+        QueryWrapper<CoreDrillPlanToExecOrg> eos = new QueryWrapper<>();
+        eos.lambda().eq(CoreDrillPlanToExecOrg::getPlanId, plan.getId());
+        final List<CoreDrillPlanToExecOrg> coreDrillPlanToExecOrgList = coreDrillPlanToExecOrgMapper.selectList(eos);
+        if (ObjectUtil.isNotEmpty(coreDrillPlanToExecOrgList)) {
+
+            final List<Long> list = coreDrillPlanToExecOrgList.stream().map(CoreDrillPlanToExecOrg::getOrgId).collect(Collectors.toList());
+            return RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectByOrgIdList(list, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+
+        }
+        return new ArrayList<>();
+    }
+
+    public List<SysOrg> getPlanPublishOrgList(CoreDrillPlan plan, List<Long> orgIdList) {
+        List<SysOrg> orgList;
+        //优先判断是否存在具体的执行机构，如果存在则直接返回，否则根据机构类型进行查询
+        if (ObjectUtil.isNotEmpty(orgIdList)) {
+            orgList = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectParentHs(orgIdList, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+            return orgList;
+        }
+        orgList = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectChildHs(plan.getCreateOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+        return orgList;
+    }
 }

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();
         }

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

@@ -83,13 +83,7 @@ public interface ICoreEduTrainingPlanService extends IService<CoreEduTrainingPla
 
     void publishPlan(Long planId);
 
-    /**
-     * 根据计划获取计划的执行机构
-     *
-     * @param plan 计划对象
-     * @return Page
-     */
-    List<SysOrg> getExecuteOrg(CoreEduTrainingPlan plan);
+
 
     List<IdName<String, String>> planList(Long orgId);
 }

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

@@ -252,7 +252,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         final int i = coreEduTrainingPlanMapper.updateById(plan);
         if (plan.getStandard() == 1) {
             //如果标准计划可以修改，那么需要删除所有计划与任务，重新创建计划任务
-            updateStandardPlan(plan, trainingPlanToRoleList, trainingPlanToExecOrgList);
+            updateStandardPlan(plan, trainingPlanToRoleList);
         } else {
             //普通计划
             updateCommonPlan(plan);
@@ -262,7 +262,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         return i;
     }
 
-    private void updateStandardPlan(CoreEduTrainingPlan plan, List<CoreEduTrainingPlanToRole> trainingPlanToRoleList, List<CoreEduTrainingPlanToExecOrg> trainingPlanToExecOrgList) {
+    private void updateStandardPlan(CoreEduTrainingPlan plan, List<CoreEduTrainingPlanToRole> trainingPlanToRoleList) {
         //没下发的就不管
         if (0 == plan.getIssue()) {
             return;
@@ -616,10 +616,6 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         return list;
     }
 
-    @Override
-    public List<SysOrg> getExecuteOrg(CoreEduTrainingPlan plan) {
-        return null;
-    }
 
     @Override
     public List<IdName<String, String>> planList(Long orgId) {

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillPlanMapper.xml

@@ -446,4 +446,61 @@
             </otherwise>
         </choose>
     </select>
+    <resultMap type="com.xunmei.common.core.domain.drill.vo.CoreDrillPlanDataVo"
+               id="CoreDrillPlanDataVoResult">
+        <result property="id" column="id"/>
+        <result property="planName" column="plan_name"/>
+        <result property="planCycle" column="plan_cycle"/>
+        <result property="execTimes" column="exec_times"/>
+        <result property="planStatus" column="plan_status"/>
+        <result property="execOrgType" column="exec_org_type"/>
+        <result property="startDate" column="start_date"/>
+        <result property="endDate" column="end_date"/>
+        <result property="buildTaskNow" column="build_task_now"/>
+        <result property="createOrgId" column="create_org_id"/>
+        <result property="createOrgName" column="create_org_name"/>
+        <result property="createOrgPath" column="create_org_path"/>
+        <result property="belongOrgId" column="belong_org_id"/>
+        <result property="belongOrgName" column="belong_org_name"/>
+        <result property="belongOrgPath" column="belong_org_path"/>
+        <result property="standard" column="standard"/>
+        <result property="issue" column="issue"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="file" column="file_list"/>
+        <collection property="planRoleList" ofType="com.xunmei.common.core.domain.edu.domain.CoreEduTrainingPlanToRole"
+                    select="com.xunmei.core.drill.mapper.CoreDrillPlanToRoleMapper.selectListByPlanId" column="id">
+            <result column="plan_id" property="planId"/>
+            <result column="role_id" property="roleId"/>
+        </collection>
+        <collection property="planExecOrgList"
+                    ofType="com.xunmei.common.core.domain.edu.domain.CoreEduTrainingPlanToExecOrg"
+                    select="com.xunmei.core.drill.mapper.CoreDrillPlanToExecOrgMapper.selectLisByPlanId"
+                    column="id">
+            <result column="plan_id" property="planId"/>
+            <result column="org_id" property="orgId"/>
+        </collection>
+    </resultMap>
+    <select id="getDetailPlanData" resultMap="CoreDrillPlanDataVoResult">
+        select *
+        from core_drill_plan p
+        where p.deleted = 0
+          and p.id = #{id}
+    </select>
+
+    <select id="selectIdByParentId" resultType="java.lang.Long">
+        select id
+        from core_drill_plan
+        where parent_id = #{planId}
+          and deleted = 0
+          and plan_status = 0
+    </select>
+
+    <select id="selectPlanRole" resultType="com.xunmei.common.core.domain.drill.vo.CoreDrillPlanRoleVo">
+        SELECT distinct r.role_id    as roleId,
+                        sr.role_name as roleName
+        FROM core_drill_plan p
+                 INNER JOIN core_drill_plan_to_role r
+                 INNER JOIN sys_role sr on r.role_id = sr.id
+        where p.belong_org_id = #{orgId}
+    </select>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillPlanToExecOrgMapper.xml

@@ -5,14 +5,14 @@
 <mapper namespace="com.xunmei.core.drill.mapper.CoreDrillPlanToExecOrgMapper">
     <select id="selectLisByPlanId" resultType="com.xunmei.common.core.domain.drill.domain.CoreDrillPlanToExecOrg">
         select g.plan_id as planId, g.org_id as orgId, o.name as orgName
-        from core_edu_training_plan_to_exec_org g
+        from core_drill_plan_to_exec_org g
                  inner join sys_org o on g.org_id = o.id
         where g.plan_id = #{planId}
     </select>
 
     <select id="selectOrgIdByPlanId" resultType="java.lang.Long">
         select distinct org_id
-        from core_edu_training_plan_to_exec_org
+        from core_drill_plan_to_exec_org
         where plan_id = #{planId}
     </select>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillPlanToRoleMapper.xml

@@ -13,14 +13,14 @@
     </select>
     <select id="selectListByPlanId" resultType="com.xunmei.common.core.domain.drill.domain.CoreDrillPlanToRole">
         select pr.plan_id as planId, pr.role_id as roleId, r.role_name as roleName
-        from core_edu_training_plan_to_role pr
+        from core_drill_plan_to_role pr
                  inner join sys_role r on pr.role_id = r.id
         where plan_id = #{planId}
     </select>
 
     <select id="selectRoleIdByPlanId" resultType="java.lang.Long">
         select distinct role_id
-        from core_edu_training_plan_to_role
+        from core_drill_plan_to_role
         where plan_id = #{planId}
     </select>
 </mapper>