Merge branch 'V0.0.1' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.1

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

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

@@ -49,11 +49,9 @@ public class CoreEduTrainingTaskEditDto {
     @ApiModelProperty(value = "截止日期")
     private Date endDate;
 
-//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "培训开始时间")
     private Date trainingStartDateTime;
 
-//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "培训截止时间")
     private Date trainingEndDateTime;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/controller/CoreEduTrainingTaskController.java

@@ -93,23 +93,13 @@ public class CoreEduTrainingTaskController extends BaseController {
         return toAjax(coreEduTrainingTaskService.deleteCoreEduTrainingTaskByIds(ids));
     }
 
-    /**
-     * 导出教育任务
-     */
-    @ApiOperation(value = "导出CoreEduTrainingTask")
-    @RequiresPermissions("core:eduTask:export")
-    @Log(title = "教育任务", businessType = BusinessType.DELETE)
-    @DeleteMapping("export")
-    public AjaxResult export() {
-        return null;
-    }
 
     /**
      * 导出教育任务
      */
     @ApiOperation(value = "导出CoreEduTrainingTask")
     @RequiresPermissions("core:eduTask:report")
-    @DeleteMapping("report")
+    @PostMapping("report")
     public AjaxResult report(@RequestBody @Validated CoreEduTrainingTaskReportDto request) {
         return success(coreEduTrainingTaskService.selectCoreEduTrainingTaskReport(request));
     }
@@ -117,7 +107,7 @@ public class CoreEduTrainingTaskController extends BaseController {
     @ApiOperation(value = "教育培训签名")
     @RequiresPermissions("core:eduTask:sign")
     @Log(title = "教育任务签名", businessType = BusinessType.DELETE)
-    @DeleteMapping("sign")
+    @PostMapping("sign")
     public AjaxResult sign(@RequestBody @Validated CoreEduTrainingTaskSignDto request) {
         return success(coreEduTrainingTaskService.selectCoreEduTrainingTaskSign(request));
     }

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

@@ -161,8 +161,6 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
      */
     @Override
     public int updateCoreEduTrainingTask(CoreEduTrainingTaskEditDto request) {
-        String format = DateUtil.format(request.getTrainingStartDateTime(), "yyyy-MM-dd HH:mm:ss");
-        System.out.println("------------------" + format + "------------------");
         CoreEduTrainingTask coreEduTrainingTask = coreEduTrainingTaskMapper.selectById(request.getId());
         BeanUtils.copyProperties(request, coreEduTrainingTask);
         coreEduTrainingTask.setRecorderId(SecurityUtils.getUserId());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppPlan.java

@@ -19,8 +19,8 @@ import java.util.Date;
  * 履职，安全检查计划表(core_resumption_plan)实体类
  *
  * @author 高雄
- * @since 2022-04-27 16:38:43
  * @description 由 Mybatisplus Code Generator 创建
+ * @since 2022-04-27 16:38:43
  */
 @Data
 @NoArgsConstructor
@@ -34,7 +34,7 @@ public class AppPlan extends Model<AppPlan> implements Serializable {
      * 主键
      */
     @TableId(type = IdType.AUTO)
-	private Long id;
+    private Long id;
     /**
      * 计划名称
      */
@@ -80,13 +80,39 @@ public class AppPlan extends Model<AppPlan> implements Serializable {
      */
     private Integer notResumptionOnRest;
 
-
+    /**
+     * 计划创建机构名称
+     */
+    @TableField(exist = false)
     private String planCreateOrgName;
+    /**
+     * 计划创建机构id
+     */
     private String planCreateOrgId;
+    /**
+     * 计划所属机构名称
+     */
+    @TableField(exist = false)
     private String planOfOrgName;
+    /**
+     * 计划所属机构id
+     */
     private String planOfOrgId;
+    /**
+     * 计划执行次数
+     */
     private String count;
+    /**
+     * 计划是否下发
+     */
     private String distributeStatus;
+    /**
+     * 计划下发默认状态
+     */
+    private String distributePlanStatus;
+    /**
+     * 计划父id(下发机构独有)
+     */
     private Long parentId;
 
 
@@ -106,7 +132,7 @@ public class AppPlan extends Model<AppPlan> implements Serializable {
      * 修改时间
      */
     @TableField(update = "now()")
-	private Date updateTime;
+    private Date updateTime;
     /**
      * 修改人id
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -94,7 +94,9 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
 
             AppPlan plan = baseMapper.selectById(dto.getId());
             plan.setOrgId(d.getOrgId().toString());
+            plan.setPlanOfOrgId(d.getOrgId().toString());
             plan.setPlanStatus(d.getStatus());
+            plan.setDistributePlanStatus(d.getStatus().toString());
             plan.setId(null);
             plan.setPlanName("下发-" + plan.getPlanName());
             plan.setParentId(dto.getId());

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppPlanMapper.xml

@@ -36,7 +36,9 @@
         a.*,
         d.roleNames,
         b.orgId,
-        b.orgNames
+        b.orgNames,
+        o.name as plan_of_org_name,
+        g.name as plan_create_org_name
         FROM
         core_resumption_plan a
         LEFT JOIN (
@@ -47,6 +49,7 @@
         FROM
         core_resumption_plan_to_exec_org m
         LEFT JOIN sys_org n ON m.org_id = n.id
+
         GROUP BY
         m.plan_id
         ) b ON a.id = b.plan_id
@@ -60,6 +63,8 @@
         GROUP BY
         r.plan_id
         ) d ON a.id = d.plan_id
+        LEFT JOIN sys_org o ON a.plan_of_org_id = o.id
+        LEFT JOIN sys_org g ON a.plan_create_org_id = g.id
         <where>
             1=1
             <if test="info.planName != '' and info.planName != null">