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

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/mapper/TMonitoringRetrievalPlanMapper.java

@@ -48,6 +48,12 @@ public interface TMonitoringRetrievalPlanMapper extends BaseMapper<TMonitoringRe
      int updateTMonitoringRetrievalPlan(TMonitoringRetrievalPlan tMonitoringRetrievalPlan);
 
     /**
+     * 逻辑删除计划以及下面所有的子计划
+     * @param tMonitoringRetrievalPlan
+     * @return
+     */
+    int updatePlan(TMonitoringRetrievalPlan tMonitoringRetrievalPlan);
+    /**
      * 删除监控调阅计划
      *
      * @param id 监控调阅计划主键

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -355,30 +355,32 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                 throw new ServiceException("子任务，不能删除");
             } else {
                 if (monitoringRetrievalPlan.getCreateType() == 0) {
-                    QueryWrapper queryWrapper = new QueryWrapper();
-                    queryWrapper.eq(PARENT_ID, monitoringRetrievalPlan.getId());
-                    List<TMonitoringRetrievalPlan> list = tMonitoringRetrievalPlanMapper.selectList(queryWrapper);
-                    list.add(monitoringRetrievalPlan);
-                    for (TMonitoringRetrievalPlan p : list) {
-                        CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = new CoreMonitoringRetrievalTask();
-                        coreMonitoringRetrievalTask.setPlanId(p.getId());
-                        coreMonitoringRetrievalTask.setStatus("0");
-                        //根据计划查询未完成的任务
-                        List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectCoreMonitoringRetrievalTaskList(coreMonitoringRetrievalTask);
-                        List<Long> collect = coreMonitoringRetrievalTasks.stream().map(CoreMonitoringRetrievalTask::getId).distinct().collect(Collectors.toList());
-                        if (CollectionUtils.isNotEmpty(collect)) {
-                            Long[] arr = new Long[collect.size()];
-                            collect.toArray(arr);
-                            iCoreMonitoringRetrievalTaskService.deleteCoreMonitoringRetrievalTaskByIds(arr);
-                        }
-                        //删除带调阅任务
-                       // iCoreMonitoringRetrievalTaskService.deleteWaitTaskByPlanId(p.getId());
-                        p.setIsDeleted(2L);
-                        i = tMonitoringRetrievalPlanMapper.updateTMonitoringRetrievalPlan(p);
-                        if (i < 1) {
-                            return i;
-                        }
-                    }
+//                    QueryWrapper queryWrapper = new QueryWrapper();
+//                    queryWrapper.eq(PARENT_ID, monitoringRetrievalPlan.getId());
+//                    List<TMonitoringRetrievalPlan> list = tMonitoringRetrievalPlanMapper.selectList(queryWrapper);
+//                    list.add(monitoringRetrievalPlan);
+//                    List<Long> planIds = new ArrayList<>();
+//                    for (TMonitoringRetrievalPlan p : list) {
+//                        CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = new CoreMonitoringRetrievalTask();
+//                        coreMonitoringRetrievalTask.setPlanId(p.getId());
+//                        coreMonitoringRetrievalTask.setStatus("0");
+//                        //根据计划查询未完成的任务
+//                        List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectCoreMonitoringRetrievalTaskList(coreMonitoringRetrievalTask);
+//                        List<Long> collect = coreMonitoringRetrievalTasks.stream().map(CoreMonitoringRetrievalTask::getId).distinct().collect(Collectors.toList());
+//                        if (CollectionUtils.isNotEmpty(collect)) {
+//                            planIds.addAll(collect);
+//                        }
+//                        p.setIsDeleted(2L);
+//                        i = tMonitoringRetrievalPlanMapper.updateTMonitoringRetrievalPlan(p);
+//                        if (i < 1) {
+//                            return i;
+//                        }
+//                    }
+//                    Long[] arr = new Long[planIds.size()];
+//                    planIds.toArray(arr);
+//                    iCoreMonitoringRetrievalTaskService.deleteCoreMonitoringRetrievalTaskByIds(arr);
+                    i = tMonitoringRetrievalPlanMapper.updatePlan(monitoringRetrievalPlan);
+                    iCoreMonitoringRetrievalTaskService.deleteWaitTaskByPlanId(id);
                 }
             }
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/ApiPlanController.java

@@ -40,8 +40,6 @@ public class ApiPlanController {
     @Autowired
     private RemoteOrgService remoteOrgService;
 
-//    @Autowired
-//    ResumptionTaskBusiness taskBusiness;
 
     /**
      * 计划分页查询
@@ -55,7 +53,6 @@ public class ApiPlanController {
         if(ObjectUtil.isNull(info.getOrgId())){
             info.setOrgId(SecurityUtils.getLoginUser().getOrgId());
         }
-//        Page<AppPlan> result = ;
         return TableDataInfo.success(appPlanService.selectPage(info));
     }
 
@@ -71,16 +68,6 @@ public class ApiPlanController {
         }
     }
 
-    @RequestMapping("/test")
-    public AjaxResult test(Integer type) {
-        R<List<Long>> res = remoteOrgService.findListByOrgType(type, SecurityConstants.INNER);
-        List<Long> list = null;
-        if (res.getCode() == 200) {
-            list = res.getData();
-        }
-        return AjaxResult.success(list);
-    }
-
     /**
      * 检查要点分页查询
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/ResumptionController.java

@@ -47,18 +47,6 @@ public class ResumptionController {
     ResumptionService resumptionService;
 
 
-//    @ApiOperation(value = "所有")
-//    @PostMapping(value = "/taskList")
-//    AjaxResult taskList(@RequestBody @Valid final ResumptionTaskDto request) throws ParseException {
-//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-//        if (request.getDateTime() == null) {
-//            request.setDateTime(sdf.format(new Date()));
-//        }
-//        ResumptionTaskVo taskvo = new ResumptionTaskVo();
-//        Map<String, Object> tasktotal = resumptionBusiness.tasktotal(request);
-//        taskvo.setTasktotal(tasktotal);
-//        return AjaxResult.success(taskvo);
-//    }
 
     @ApiOperation(value = "new所有")
     @PostMapping(value = "/newTaskList")
@@ -123,22 +111,6 @@ public class ResumptionController {
         return AjaxResult.success(all);
     }
 
-//    @ApiOperation(value = "详情")
-//    @PostMapping(value = "/taskDetails")
-//    AjaxResult taskDetails(@RequestBody @Valid TaskDetailsDto request) throws ParseException {
-//        System.out.println(JSON.toJSONString(request));
-//        TaskDetailsVo detailvo = new TaskDetailsVo();
-//        List<Map<String, Object>> tasktotal = resumptionBusiness.taskarealistnew(request);
-//        ResumptionTaskListVo taskObj = resumptionBusiness.getTaskObjByTaskid(request);
-//        SysConfig systemParame = remoteConfigService.findFirstByCode(SystemParameterConstant.NFC_SCANNING, SecurityConstants.INNER).getData();
-//
-////        SysConfig systemParame = systemParameService.findFirstByCode(SystemParameterConstant.NFC_SCANNING, SecurityConstants.INNER).getData();
-//        detailvo.setTaskarealist(tasktotal);
-//        detailvo.setTaskObj(taskObj);
-//        detailvo.setNfcScaning("0");
-////        detailvo.setNfcScaning(systemParame.getValue());
-//        return AjaxResult.success(detailvo);
-//    }
 
     @ApiOperation(value = "跳转编辑")
     @PostMapping(value = "/toTaskDetails")
@@ -182,9 +154,6 @@ public class ResumptionController {
         detailvo.setAreaScanY(areaScanY);
 
         ResumptionTaskListVo taskObj = resumptionBusiness.getTaskObjByTaskid(request);
-//        SysConfig systemParame = remoteConfigService.findFirstByCode(SystemParameterConstant.NFC_SCANNING, SecurityConstants.INNER).getData();
-
-//        SysConfig systemParame = systemParameService.findFirstByCode(SystemParameterConstant.NFC_SCANNING, SecurityConstants.INNER).getData();
         detailvo.setTaskarealist(tasktotal);
         detailvo.setTaskObj(taskObj);
         detailvo.setNfcScaning("0");
@@ -192,12 +161,6 @@ public class ResumptionController {
         return AjaxResult.success(detailvo);
     }
 
-   /* @ApiOperation(value = "保存履职数据")
-    @PostMapping(value = "/submitTaskData")
-    JsonResponse submitTaskData(final LoginUser user, @RequestBody @Valid final ResumptionTaskDataDto request) throws ParseException {
-        int num = this.resumptionBusiness.submitTaskData(request,user);
-        return JsonResponse.success(num);
-    }*/
 
     @ApiOperation(value = "保存履职数据")
     @PostMapping(value = "/submitTaskData")
@@ -208,14 +171,11 @@ public class ResumptionController {
         if (!hasKey) {
             RedisUtils.setCacheObject("resumption" + request.getResumptionId(), request.getResumptionId(), Duration.ofMillis(1000 * 20));
         }
-        /*boolean flag =redisService.redisTemplate.opsForHash().putIfAbsent("resumption"+request.getTaskid(),request.getTaskid(),request.getTaskid());//redisTemplate.opsForValue().setIfAbsent("resumption"+request.getTaskid(), "resumption"+request.getTaskid());
-        redisService.redisTemplate.expire("resumption"+request.getTaskid(),1000*20, TimeUnit.MILLISECONDS);*/
         if (hasKey) {
             throw new RuntimeException("请勿重复提交");
         }
 
         try {
-            //final Resumption resumption = this.resumptionService.find(request.getTaskid());
             final Resumption resumption = resumptionService.findOneByTaskIdAndDate(request);
 
             if (resumption.getStatus() == 1 || resumption.getStatus() == 2) {
@@ -228,16 +188,13 @@ public class ResumptionController {
             int num = this.resumptionBusiness.submitTaskData(request, SecurityUtils.getLoginUser(), resumption);
 
             RedisUtils.deleteObject("resumption" + request.getResumptionId());
-            //redisService.redisTemplate.opsForHash().delete("resumption"+request.getTaskid(),request.getTaskid());
             return AjaxResult.success(num);
         } catch (Exception e) {
             RedisUtils.deleteObject("resumption" + request.getResumptionId());
             log.error(e.getMessage(), e);
-            //redisService.redisTemplate.opsForHash().delete("resumption"+request.getTaskid(),request.getTaskid());
             return AjaxResult.error(e.getMessage());
         } finally {
             RedisUtils.deleteObject("resumption" + request.getResumptionId());
-            //redisService.redisTemplate.opsForHash().delete("resumption"+request.getTaskid(),request.getTaskid());
         }
     }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/TaskController.java

@@ -15,7 +15,7 @@ import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.core.resumption.domain.AppPlan;
 import com.xunmei.core.resumption.dto.doTaskDto;
 import com.xunmei.core.resumption.service.AppPlanService;
-import com.xunmei.core.resumption.service.ISysResumptionService;
+import com.xunmei.core.resumption.service.ResumptionService;
 import com.xunmei.core.resumption.task.ResumptionTaskBusiness;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.RemoteWorkTimeService;
@@ -45,29 +45,14 @@ public class TaskController {
     @Autowired
     private RemoteOrgService orgService;
     @Autowired
-    private ISysResumptionService resumptionService;
+    private ResumptionService resumptionService;
 
     @GetMapping("/dayTask")
     public AjaxResult dayTask() {
-//        //执行周期为每周的履职计划Plan_cycle=0,6
-//        DateTime datetime = new DateTime();
-//        datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-//        JobLog jobLog = JobLog.builder().id(IDHelper.id()).jobCode("dayTask").jobName("每小时每日履职任务生成job").jobDate(datetime).createTime(datetime).build();
-//        boolean flag = jobLogService.isJobRunning(jobLog);
-//        if(flag){
-//            SCHEDULEDTASKSLOG.info("每小时每日履职任务生成job已执行，本次不执行");
-//            return;
-//        }
-//        SCHEDULEDTASKSLOG.info("================开始执行每日每小时履职任务生成任务================");
-//        taskBusiness.syncHour(datetime,6);
-//        taskBusiness.syncDay(datetime,0);
-//        SCHEDULEDTASKSLOG.info("================每日每小时履职任务生成任务执行结束================");
+
         DateTime datetime = new DateTime();
         datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-//        SCHEDULEDTASKSLOG.info("================开始执行每日每小时履职任务生成任务================");
-//        taskBusiness.syncHour(datetime,6);
         taskBusiness.syncDay(datetime, 2);
-//        SCHEDULEDTASKSLOG.info("================每日每小时履职任务生成任务执行结束================");
         return AjaxResult.success();
     }
 
@@ -75,9 +60,7 @@ public class TaskController {
     public AjaxResult weekTask() {
         DateTime datetime = new DateTime();
         datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-//        SCHEDULEDTASKSLOG.info("================开始执行每周履职任务生成任务================");
         taskBusiness.syncWeek(datetime, 3);
-//        SCHEDULEDTASKSLOG.info("================每周履职任务生成任务执行结束================");
         return AjaxResult.success();
     }
 
@@ -88,7 +71,6 @@ public class TaskController {
         DateHelper dateHelper = new DateHelper(datetime);
         int month = dateHelper.getMonth();
         int day = dateHelper.getDay();
-//        SCHEDULEDTASKSLOG.info("================开始执行每月，每季，每半年，每年履职任务生成任务================");
         if (month == 1 && day == 1) {
             //1.1日获取执行周期为每月，每季，每半年，每年的履职计划Plan_cycle=2,3,4,5
             taskBusiness.syncMonth(datetime, 4);
@@ -109,7 +91,6 @@ public class TaskController {
             //其他获取每月履职计划Plan_cycle=2
             taskBusiness.syncMonth(datetime, 4);
         }
-//        SCHEDULEDTASKSLOG.info("================每月，每季，每半年，每年履职任务生成任务执行结束================");
         return AjaxResult.success();
     }
 
@@ -127,9 +108,6 @@ public class TaskController {
         //当有周期存在时保持原有接口不变（doTask），否则按照新的接口创建
         Integer plancycle = request.getPlancycle();
         if (plancycle != null) {
-//            if (plancycle == 6) {
-//                taskBusiness.syncHour(datetime, plancycle);
-//            }
             if (plancycle == 2) {
                 taskBusiness.syncDay(datetime, plancycle);
             }

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

@@ -1,6 +1,7 @@
 package com.xunmei.core.resumption.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xunmei.common.core.utils.FormType;
 import com.xunmei.common.core.utils.ResumptionStatus;
@@ -9,6 +10,7 @@ import com.xunmei.common.core.utils.Ymd;
 import com.xunmei.common.core.web.domain.BaseEntity;
 import com.xunmei.system.api.domain.SysOrg;
 import feign.form.FormData;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -127,6 +129,59 @@ public class Resumption extends BaseEntity {
     private Date planStartTime;
     private Date planEndTime;
     private Long roleId;
+    /**
+     * 年月日
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "年月日")
+    private Date ymdDate;
+
+    /**
+     * 日
+     */
+    @ApiModelProperty(value = "日")
+    private Long ymdDay;
+
+    /**
+     * 月
+     */
+    @ApiModelProperty(value = "月")
+    private Long ymdMonth;
+
+    /**
+     * 季
+     */
+    @ApiModelProperty(value = "季")
+    private Long ymdQuarter;
+
+    /**
+     * 周
+     */
+    @ApiModelProperty(value = "周")
+    private Long ymdWeek;
+
+    /**
+     * 年
+     */
+    @ApiModelProperty(value = "年")
+    private Long ymdYear;
+
+    /**
+     * 半年
+     */
+    @ApiModelProperty(value = "半年")
+    private Long ymdHalfyear;
+    /**
+     * 小时
+     */
+    @ApiModelProperty(value = "小时")
+    private Long ymdHour;
+
+    /**
+     * 分钟
+     */
+    @ApiModelProperty(value = "分钟")
+    private Long ymdMinute;
 
 
     /**

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

@@ -1,268 +0,0 @@
-package com.xunmei.core.resumption.domain;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xunmei.common.core.utils.Ymd;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.xunmei.common.core.web.domain.BaseEntity;
-
-/**
- * 【请填写功能名称】对象 core_resumption
- *
- * @author xunmei
- * @date 2023-08-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("core_resumption")
-@ApiModel(value = "SysResumption对象", description = "【请填写功能名称】")
-public class SysResumption extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * $column.columnComment
-     */
-    private String id;
-    @TableField(exist = false)
-    private Ymd ymd;
-    /**
-     * 最后修改人id
-     */
-    @ApiModelProperty(value = "最后修改人id")
-    private Long modifiedId;
-
-    /**
-     * 修改人名称
-     */
-    @ApiModelProperty(value = "修改人名称")
-    private String modifiedName;
-
-    /**
-     * 异常数目
-     */
-    @ApiModelProperty(value = "异常数目")
-    private Long exceptionCount;
-
-    /**
-     * 表单类型
-     */
-    @ApiModelProperty(value = "表单类型")
-    private Long formType;
-
-    /**
-     * 机构
-     */
-    @ApiModelProperty(value = "机构")
-    private Long orgId;
-
-    /**
-     * 状态
-     */
-    @ApiModelProperty(value = "状态")
-    private Long status;
-
-    /**
-     * 履职类型 0日 1周 2月 3季 4半年 5年 6小时
-     */
-    @ApiModelProperty(value = "履职类型 0日 1周 2月 3季 4半年 5年 6小时")
-    private Integer type;
-
-    /**
-     * 年月日
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "年月日")
-    private Date ymdDate;
-
-    /**
-     * 日
-     */
-    @ApiModelProperty(value = "日")
-    private Long ymdDay;
-    private String name;
-
-    /**
-     * 月
-     */
-    @ApiModelProperty(value = "月")
-    private Long ymdMonth;
-
-    /**
-     * 季
-     */
-    @ApiModelProperty(value = "季")
-    private Long ymdQuarter;
-
-    /**
-     * 周
-     */
-    @ApiModelProperty(value = "周")
-    private Long ymdWeek;
-
-    /**
-     * 年
-     */
-    @ApiModelProperty(value = "年")
-    private Long ymdYear;
-
-    /**
-     * 半年
-     */
-    @ApiModelProperty(value = "半年")
-    private Long ymdHalfyear;
-
-    /**
-     * 提交时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "提交时间")
-    private Date submitTime;
-
-    /**
-     * 小时
-     */
-    @ApiModelProperty(value = "小时")
-    private Long ymdHour;
-
-    /**
-     * 分钟
-     */
-    @ApiModelProperty(value = "分钟")
-    private Long ymdMinute;
-
-    /**
-     * 计划id
-     */
-    @ApiModelProperty(value = "计划id")
-    private Long planId;
-
-    /**
-     * 任务执行开始时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "任务执行开始时间")
-    private Date startTime;
-
-    /**
-     * 任务执行结束时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "任务执行结束时间")
-    private Date endTime;
-
-    /**
-     * 计划开始时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "计划开始时间")
-    private Date planStartTime;
-
-    /**
-     * 计划截止时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "计划截止时间")
-    private Date planEndTime;
-
-    /**
-     * 角色id
-     */
-    @ApiModelProperty(value = "角色id")
-    private Long roleId;
-
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-
-
-                .append("id", getId())
-
-
-                .append("createTime", getCreateTime())
-
-
-                .append("modifiedId", getModifiedId())
-
-
-                .append("modifiedName", getModifiedName())
-
-
-                .append("updateTime", getUpdateTime())
-
-
-                .append("exceptionCount", getExceptionCount())
-
-
-                .append("formType", getFormType())
-
-
-                .append("orgId", getOrgId())
-
-
-                .append("status", getStatus())
-
-
-                .append("type", getType())
-
-
-                .append("ymdDate", getYmdDate())
-
-
-                .append("ymdDay", getYmdDay())
-
-
-                .append("ymdMonth", getYmdMonth())
-
-
-                .append("ymdQuarter", getYmdQuarter())
-
-
-                .append("ymdWeek", getYmdWeek())
-
-
-                .append("ymdYear", getYmdYear())
-
-
-                .append("ymdHalfyear", getYmdHalfyear())
-
-
-                .append("submitTime", getSubmitTime())
-
-
-                .append("ymdHour", getYmdHour())
-
-
-                .append("ymdMinute", getYmdMinute())
-
-
-                .append("planId", getPlanId())
-
-
-                .append("startTime", getStartTime())
-
-
-                .append("endTime", getEndTime())
-
-
-                .append("planStartTime", getPlanStartTime())
-
-
-                .append("planEndTime", getPlanEndTime())
-
-
-                .append("roleId", getRoleId())
-                .toString();
-    }
-}

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

@@ -1,104 +0,0 @@
-package com.xunmei.core.resumption.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author oygj
- * @since 2023-07-04
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_app_todo")
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@ApiModel(value = "Todo对象", description = "")
-public class Todo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("id")
-    private String id;
-
-    @ApiModelProperty(value = "应用")
-    @TableField("app_id")
-    private Long appId;
-
-    @ApiModelProperty(value = "标题名称，一个应用下可能会有多种标题，如每日履职对应每小时和每日")
-    @TableField("title")
-    private String title;
-
-    @ApiModelProperty(value = "内容")
-    @TableField("content")
-    private String content;
-
-    @ApiModelProperty(value = "待办开始时间")
-    @TableField("date")
-    private Date date;
-
-    @ApiModelProperty(value = "待办结束时间")
-    @TableField("end_date")
-    private Date endDate;
-
-    @ApiModelProperty(value = "待办的过期（删除）时间，某些类型的待办结束了仍可执行")
-    @TableField("over_date")
-    private Date overDate;
-
-    @ApiModelProperty(value = "扩展字段")
-    @TableField("extra")
-    private String extra;
-
-    @ApiModelProperty(value = "机构")
-    @TableField("org_id")
-    private Long orgId;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime=new Date();
-
-    @ApiModelProperty(value = "最后修改人id")
-    @TableField("modified_id")
-    private Long modifiedId;
-
-    @ApiModelProperty(value = "修改人名称")
-    @TableField("modified_name")
-    private String modifiedName;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "服务商")
-    @TableField("service_id")
-    private Long serviceId;
-
-    @TableField("detail_info")
-    private String detailInfo;
-
-//    @TableField(exist = false)
-//    private App app;
-
-    @TableField(exist = false)
-    private List<TodoUser> users;
-
-    @TableField(exist = false)
-    private List<TodoRole> roles;
-
-}

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

@@ -1,82 +0,0 @@
-package com.xunmei.core.resumption.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author oygj
- * @since 2023-07-04
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_app_todo_alert")
-@ApiModel(value = "TodoAlert对象", description = "")
-public class TodoAlert implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("id")
-    private String id;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
-    @ApiModelProperty(value = "最后修改人id")
-    @TableField("modified_id")
-    private Long modifiedId;
-
-    @ApiModelProperty(value = "修改人名称")
-    @TableField("modified_name")
-    private String modifiedName;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "星期几")
-    @TableField("date")
-    private Integer date;
-
-    @ApiModelProperty(value = "日")
-    @TableField("day")
-    private Integer day;
-
-    @ApiModelProperty(value = "月")
-    @TableField("month")
-    private Integer month;
-
-    @ApiModelProperty(value = "子类型")
-    @TableField("sub_type")
-    private String subType;
-
-    @ApiModelProperty(value = "子类型文字")
-    @TableField("sub_type_text")
-    private String subTypeText;
-
-    @ApiModelProperty(value = "时间")
-    @TableField("time")
-    private String time;
-
-    @ApiModelProperty(value = "类型")
-    @TableField("type")
-    private String type;
-
-    @ApiModelProperty(value = "类型文字")
-    @TableField("type_text")
-    private String typeText;
-
-
-}

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

@@ -1,44 +0,0 @@
-package com.xunmei.core.resumption.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 角色代办表
- * </p>
- *
- * @author oygj
- * @since 2023-07-05
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_app_todo_role")
-@NoArgsConstructor
-@AllArgsConstructor
-@SuperBuilder
-@ApiModel(value = "TodoRole对象", description = "角色代办表")
-public class TodoRole implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("id")
-    private Long id;
-
-    @TableField("todo_id")
-    private String todoId;
-
-    @TableField("role_id")
-    private Long roleId;
-
-
-}

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

@@ -1,57 +0,0 @@
-package com.xunmei.core.resumption.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author oygj
- * @since 2023-07-04
- */
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_app_todo_user")
-@ApiModel(value = "TodoUser对象", description = "")
-public class TodoUser implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @TableField("todo_id")
-    private String todoId;
-
-    @ApiModelProperty(value = "应用")
-    @TableField("app_id")
-    private Long appId;
-
-    @TableField("user_id")
-    private Long userId;
-
-    public TodoUser(Long id, String todoId, Long userId) {
-        this.id = id;
-        this.todoId = todoId;
-        this.userId = userId;
-    }
-
-}
-
-

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/mapper/ResumptionMapper.java

@@ -6,9 +6,11 @@ import com.xunmei.core.resumption.domain.Resumption;
 import com.xunmei.core.resumption.dto.ResumptionTaskDto;
 import com.xunmei.core.resumption.vo.ResumptionAppVo;
 import com.xunmei.core.resumption.vo.ResumptionTaskNewDto;
+import com.xunmei.core.resumption.vo.WorkChangeResumptionVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -27,7 +29,9 @@ public interface ResumptionMapper extends BaseMapper<Resumption> {
     void updateResumption(@Param("resumption") Resumption resumption);
 
     List<ResumptionAppVo> findResumptionApp(@Param("res") ResumptionTaskNewDto res);
+    List<WorkChangeResumptionVo> findResumptionList(@Param("orgIds") List<Long> orgIds, @Param("date") Date date, @Param("type") Integer type, @Param("status") Integer status, @Param("year") Integer year, @Param("quarter") Integer quarter);
 
+    void deleteResumption(@Param("ids") List<String> ids,@Param("year") Integer year, @Param("quarter") Integer quarter);
     /**
      * 根据类型和计划结束时间查询履职
      * @param type

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/mapper/SysResumptionMapper.java

@@ -1,69 +0,0 @@
-package com.xunmei.core.resumption.mapper;
-
-import java.util.Date;
-import java.util.List;
-
-import com.xunmei.core.resumption.domain.SysResumption;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.core.resumption.vo.WorkChangeResumptionVo;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 【请填写功能名称】Mapper接口
- *
- * @author xunmei
- * @date 2023-08-22
- */
-public interface SysResumptionMapper extends BaseMapper<SysResumption> {
-    /**
-     * 查询【请填写功能名称】
-     *
-     * @param id 【请填写功能名称】主键
-     * @return 【请填写功能名称】
-     */
-    public SysResumption selectSysResumptionById(String id);
-
-    /**
-     * 查询【请填写功能名称】列表
-     *
-     * @param sysResumption 【请填写功能名称】
-     * @return 【请填写功能名称】集合
-     */
-    public List<SysResumption> selectSysResumptionList(SysResumption sysResumption);
-
-    /**
-     * 新增【请填写功能名称】
-     *
-     * @param sysResumption 【请填写功能名称】
-     * @return 结果
-     */
-    public int insertSysResumption(SysResumption sysResumption);
-
-    /**
-     * 修改【请填写功能名称】
-     *
-     * @param sysResumption 【请填写功能名称】
-     * @return 结果
-     */
-    public int updateSysResumption(SysResumption sysResumption);
-
-    /**
-     * 删除【请填写功能名称】
-     *
-     * @param id 【请填写功能名称】主键
-     * @return 结果
-     */
-    public int deleteSysResumptionById(String id);
-
-    /**
-     * 批量删除【请填写功能名称】
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteSysResumptionByIds(String[] ids);
-
-    List<WorkChangeResumptionVo> findResumptionList(@Param("orgIds") List<Long> orgIds, @Param("date") Date date, @Param("type") Integer type, @Param("status") Integer status, @Param("year") Integer year, @Param("quarter") Integer quarter);
-
-    void deleteResumption(@Param("ids") List<String> ids,@Param("year") Integer year, @Param("quarter") Integer quarter);
-}

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

@@ -1,81 +0,0 @@
-package com.xunmei.core.resumption.service;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import cn.hutool.core.date.DateTime;
-import com.xunmei.core.resumption.domain.AppPlan;
-import com.xunmei.core.resumption.domain.SysResumption;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.core.resumption.vo.AppRulePointTaskVo;
-import com.xunmei.core.resumption.vo.WorkChangeResumptionVo;
-import com.xunmei.common.core.utils.ResumptionType;
-
-/**
- * 【请填写功能名称】Service接口
- *
- * @author xunmei
- * @date 2023-08-22
- */
-public interface ISysResumptionService extends IService<SysResumption> {
-    /**
-     * 查询【请填写功能名称】
-     *
-     * @param id 【请填写功能名称】主键
-     * @return 【请填写功能名称】
-     */
-    public SysResumption selectSysResumptionById(String id);
-    public void newbuild(Long orgId, ResumptionType type, Date dateTime, Boolean isWork, AppPlan appPlan, List<Object> nfcList, List<AppRulePointTaskVo> pointList, List<Long> roleIds, DateTime planstartTime, DateTime planendTime) ;
-    public List<WorkChangeResumptionVo> findResumptionList( List<Long> orgIds, Date date,Integer type,Integer status, Integer year, Integer quarter);
-    public void saveResumption(List<SysResumption> listResumption, List<AppPlan> appPlanList,List<Map<String,Long>> planIdAndOrgs);
-    public void deleteResumption(List<String> ids,Integer year, Integer quarter);
-    /**
-     * 查询【请填写功能名称】列表
-     *
-     * @param sysResumption 【请填写功能名称】
-     * @return 【请填写功能名称】集合
-     */
-    public List<SysResumption> selectSysResumptionList(SysResumption sysResumption);
-
-    /**
-     * 新增【请填写功能名称】
-     *
-     * @param sysResumption 【请填写功能名称】
-     * @return 结果
-     */
-    public int insertSysResumption(SysResumption sysResumption);
-
-    /**
-     * 修改【请填写功能名称】
-     *
-     * @param sysResumption 【请填写功能名称】
-     * @return 结果
-     */
-    public int updateSysResumption(SysResumption sysResumption);
-
-    /**
-     * 批量删除【请填写功能名称】
-     *
-     * @param ids 需要删除的【请填写功能名称】主键集合
-     * @return 结果
-     */
-    public int deleteSysResumptionByIds(String[] ids);
-
-    /**
-     * 删除【请填写功能名称】信息
-     *
-     * @param id 【请填写功能名称】主键
-     * @return 结果
-     */
-    public int deleteSysResumptionById(String id);
-
-    /**
-     * 查询【请填写功能名称】分页数据
-     *
-     * @param sysResumption 查询条件对象
-     * @return Page
-     */
-    public TableDataInfo selectPage(SysResumption sysResumption);
-}

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

@@ -1,13 +1,19 @@
 package com.xunmei.core.resumption.service;
 
+import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.utils.ResumptionType;
+import com.xunmei.core.resumption.domain.AppPlan;
 import com.xunmei.core.resumption.domain.Resumption;
 import com.xunmei.core.resumption.dto.resumptionRegister.ResumptionTaskDataDto;
 import com.xunmei.core.resumption.dto.TaskDetailsDto;
+import com.xunmei.core.resumption.vo.AppRulePointTaskVo;
 import com.xunmei.core.resumption.vo.ResumptionAppVo;
 import com.xunmei.core.resumption.vo.ResumptionTaskNewDto;
+import com.xunmei.core.resumption.vo.WorkChangeResumptionVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -30,4 +36,8 @@ public interface ResumptionService extends IService<Resumption> {
     void updateResumption(@Param("resumption") Resumption resumption);
 
     List<ResumptionAppVo> findResumptionApp(@Param("res") ResumptionTaskNewDto res);
+    public void newbuild(Long orgId, ResumptionType type, Date dateTime, Boolean isWork, AppPlan appPlan, List<Object> nfcList, List<AppRulePointTaskVo> pointList, List<Long> roleIds, DateTime planstartTime, DateTime planendTime) ;
+    public List<WorkChangeResumptionVo> findResumptionList(List<Long> orgIds, Date date, Integer type, Integer status, Integer year, Integer quarter);
+    public void saveResumption(List<Resumption> listResumption, List<AppPlan> appPlanList, List<Map<String,Long>> planIdAndOrgs);
+    public void deleteResumption(List<String> ids,Integer year, Integer quarter);
 }

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

@@ -52,7 +52,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
     @Autowired
     private AppPlanToExecOrgMapper appPlanToExecOrgMapper;
     @Autowired
-    private SysResumptionMapper sysResumptionMapper;
+    private ResumptionMapper resumptionMapper;
 
     @Override
     public List<Long> selectItemIdsByPlanId(Long id) {
@@ -298,9 +298,9 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
                 app.setRoleList(new ArrayList<>());
             }
             //修改
-            QueryWrapper<AppPlan> qw = new QueryWrapper<>();
-            qw.lambda().eq(AppPlan::getPlanName, app.getPlanName())
-                    .ne(AppPlan::getId, plan.getId());
+//            QueryWrapper<AppPlan> qw = new QueryWrapper<>();
+//            qw.lambda().eq(AppPlan::getPlanName, app.getPlanName())
+//                    .ne(AppPlan::getId, plan.getId());
 
 //            Long size = baseMapper.selectCount(qw);
 //
@@ -310,9 +310,11 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
 
             plan.setUpdateTime(new Date());
             plan.setModifiedBy(SecurityUtils.getUserId());
+            //前端总是会传递计划创建id,修改时需要排除
+            plan.setPlanCreateOrgId(null);
+            plan.setPlanCreateOrgName(null);
             baseMapper.updateById(plan);
 
-
             List<AppPlan> appPlans = baseMapper.selectList(new LambdaQueryWrapper<AppPlan>().eq(AppPlan::getParentId, plan.getId()));
             for (AppPlan ap :
                     appPlans) {
@@ -470,7 +472,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         /**
          * 验证计划是否被应用
          */
-        Long num = sysResumptionMapper.selectCount(new QueryWrapper<SysResumption>().eq("plan_id", id));
+        Long num = resumptionMapper.selectCount(new QueryWrapper<Resumption>().eq("plan_id", id));
         if (num > 0) {
             throw new RuntimeException("计划已生成任务，不能删除！");
         }

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

@@ -1,21 +1,36 @@
 package com.xunmei.core.resumption.service.impl;
 
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mysql.cj.PreparedQuery;
 import com.xunmei.common.core.utils.DateHelper;
+import com.xunmei.common.core.utils.ResumptionType;
+import com.xunmei.common.core.utils.Ymd;
+import com.xunmei.core.resumption.domain.AppPlan;
 import com.xunmei.core.resumption.domain.Resumption;
 import com.xunmei.core.resumption.dto.resumptionRegister.ResumptionTaskDataDto;
 import com.xunmei.core.resumption.dto.TaskDetailsDto;
 import com.xunmei.core.resumption.mapper.ResumptionMapper;
 import com.xunmei.core.resumption.service.ResumptionService;
+import com.xunmei.core.resumption.vo.AppRulePointTaskVo;
 import com.xunmei.core.resumption.vo.ResumptionAppVo;
 import com.xunmei.core.resumption.vo.ResumptionTaskNewDto;
+import com.xunmei.core.resumption.vo.WorkChangeResumptionVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class ResumptionServiceImpl extends ServiceImpl<ResumptionMapper, Resumption> implements ResumptionService {
@@ -68,5 +83,73 @@ public class ResumptionServiceImpl extends ServiceImpl<ResumptionMapper, Resumpt
     public List<ResumptionAppVo> findResumptionApp(ResumptionTaskNewDto res) {
         return resumptionMapper.findResumptionApp(res);
     }
+    @Override
+    @Transactional(readOnly = false, rollbackFor = {Exception.class, RuntimeException.class}, propagation = Propagation.REQUIRES_NEW)
+    public void newbuild(Long orgId, ResumptionType type, final Date dateTime, final Boolean isWork, AppPlan appPlan, List<Object> nfcList, List<AppRulePointTaskVo> pointList, List<Long> roleIds, DateTime planstartTime, DateTime planendTime) {
+        Ymd ymd = Ymd.of(dateTime);
+        //id使用uuid
+        // final Resumption resumption = this.findOrCreate(id,()-> Resumption.newof(orgId,type,ymd,appPlan.getId(), id));
+        // 原来的id根据规则参数，可以根据规则产生和数据库里已存在的id，
+        // 现在使用uuid，数据库中肯定不存在，故不需要拿id去数据库查询，直接创建新的对象
+        List<Resumption> resumptions = new ArrayList<>();
+
+        Date time = new Date();
+
+        for (Long roleId : roleIds) {
+            //结束时间 23:59:59变00:00:00的问题(周，月，季，半年，年)
+            if (type.getValue() != 1 && type.getValue() != 2) {
+                planendTime = DateUtil.endOfDay(planendTime).offset(DateField.MILLISECOND, -999);
+            }
+            Resumption resumption = new Resumption();
+            resumption.setStatus( 1);
+            resumption.setYmd(ymd);
+            resumption.setName(appPlan.getPlanName());
+            resumption.setYmdDate(ymd.getDate());
+            resumption.setYmdDay(Long.valueOf(ymd.getDay()));
+            resumption.setYmdMonth(Long.valueOf(ymd.getMonth()));
+            resumption.setYmdWeek(Long.valueOf(ymd.getWeek()));
+            resumption.setYmdYear(Long.valueOf(ymd.getYear()));
+            resumption.setYmdHour(Long.valueOf(ymd.getHour()));
+            resumption.setYmdQuarter(Long.valueOf(ymd.getQuarter()));
+            resumption.setYmdHalfyear(Long.valueOf(ymd.getHalfyear()));
+            resumption.setPlanId((ObjectUtil.equal(appPlan.getParentId(), -1L) || ObjectUtil.isNull(appPlan.getParentId())) ? appPlan.getId() : appPlan.getParentId());
+            resumption.setOrgId(orgId);
+            resumption.setType(type.getValue());
+            resumption.setRoleId(roleId);
+            resumption.setPlanStartTime(planstartTime);
+            resumption.setPlanEndTime(planendTime);
+            resumption.setCreateTime(time);
+            resumptions.add(resumption);
+        }
 
+        this.saveBatch(resumptions);
+
+    }
+    @Override
+    public List<WorkChangeResumptionVo> findResumptionList(List<Long> orgIds, Date date, Integer type, Integer status, Integer year, Integer quarter) {
+        return resumptionMapper.findResumptionList(orgIds, date, type, status, year, quarter);
+    }
+    @Override
+    @Transactional(readOnly = false, rollbackFor = {Exception.class, RuntimeException.class}, propagation = Propagation.REQUIRES_NEW)
+    public void saveResumption(List<Resumption> listResumption, List<AppPlan> appPlanList, List<Map<String, Long>> planIdAndOrgs) {
+        //筛选出listResumption每个对象的 planId和orgId 同时在planIdAndOrgs中的数据
+        List<Resumption> resumptionList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(planIdAndOrgs) && CollectionUtils.isNotEmpty(listResumption)) {
+            for (Resumption re : listResumption) {
+                for (Map<String, Long> map : planIdAndOrgs) {
+                    if (!(re.getPlanId().equals(map.get("planId")) && re.getOrgId().equals(map.get("orgId")))) {
+                        resumptionList.add(re);
+                    }
+                }
+            }
+        } else {
+            resumptionList = listResumption;
+        }
+        //this.save(resumptionList);
+        this.saveBatch(resumptionList);
+    }
+    @Override
+    public void deleteResumption(List<String> ids, Integer year, Integer quarter) {
+        resumptionMapper.deleteResumption(ids, year, quarter);
+    }
 }

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

@@ -1,336 +0,0 @@
-package com.xunmei.core.resumption.service.impl;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import cn.hutool.core.date.DateField;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.xunmei.common.core.constant.SecurityConstants;
-import com.xunmei.common.core.utils.DateUtils;
-import com.xunmei.common.core.utils.Ymd;
-import com.xunmei.core.resumption.domain.AppPlan;
-import com.xunmei.core.resumption.domain.SysResumption;
-import com.xunmei.core.resumption.domain.Todo;
-import com.xunmei.core.resumption.domain.TodoRole;
-import com.xunmei.core.resumption.mapper.SysResumptionMapper;
-import com.xunmei.core.resumption.service.ISysResumptionService;
-import com.xunmei.core.resumption.domain.AppResumptionDataRemarkimg;
-import com.xunmei.core.resumption.vo.AppRulePointTaskVo;
-import com.xunmei.core.resumption.vo.WorkChangeResumptionVo;
-import com.xunmei.common.core.utils.ResumptionType;
-import com.xunmei.system.api.RemoteOrgService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-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 org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 【请填写功能名称】Service业务层处理
- *
- * @author xunmei
- * @date 2023-08-22
- */
-@Service
-public class SysResumptionServiceImpl extends ServiceImpl<SysResumptionMapper, SysResumption> implements ISysResumptionService {
-    @Autowired
-    private SysResumptionMapper sysResumptionMapper;
-    @Autowired
-    private RemoteOrgService orgService;
-
-    @Override
-    public TableDataInfo selectPage(SysResumption sysResumption) {
-
-
-        //未删除
-//        sysResumption.setDeleted(0L);
-        Page<SysResumption> page;
-        //分页
-        if (sysResumption.getPageNum() != null && sysResumption.getPageSize() != null) {
-            page = new Page<>(sysResumption.getPageNum(), sysResumption.getPageSize());
-        } else {
-            page = new Page<>();
-        }
-        //查询条件
-        QueryWrapper<SysResumption> query = new QueryWrapper<>(sysResumption);
-        //下穿
-        if (sysResumption.getCheckSub()) {
-            List<Long> ids = orgService.selectCheckSubOrgIdList(sysResumption.getOrgId(), SecurityConstants.INNER);
-//            if(checkSubOrgIdList.getCode()!=200){
-////                return checkSubOrgIdList.getMsg();
-//            }
-            //  List<Long> ids = checkSubOrgIdList.getData();
-            //清空前端传递的org_id
-            sysResumption.setOrgId(null);
-            //添加in条件
-            query.in("org_id", ids);
-        }
-        //时间范围查询
-        if (sysResumption.getParams().get("beginTime") != null && sysResumption.getParams().get("endTime") != null) {
-            query.between("create_time", sysResumption.getParams().get("beginTime"), sysResumption.getParams().get("endTime"));
-        }
-        //获取数据
-        page = sysResumptionMapper.selectPage(page, query);
-        //抓换为TableDataInfo适配前端
-        TableDataInfo tableDataInfo = new TableDataInfo();
-        tableDataInfo.setMsg("操作成功");
-        tableDataInfo.setCode(200);
-        tableDataInfo.setTotal(page.getTotal());
-        tableDataInfo.setRows(page.getRecords());
-        return tableDataInfo;
-
-
-    }
-
-
-    /**
-     * 查询【请填写功能名称】
-     *
-     * @param id 【请填写功能名称】主键
-     * @return 【请填写功能名称】
-     */
-    @Override
-    public SysResumption selectSysResumptionById(String id) {
-        return sysResumptionMapper.selectById(id);
-    }
-
-    @Override
-    public void deleteResumption(List<String> ids, Integer year, Integer quarter) {
-        sysResumptionMapper.deleteResumption(ids, year, quarter);
-    }
-
-    @Override
-    @Transactional(readOnly = false, rollbackFor = {Exception.class, RuntimeException.class}, propagation = Propagation.REQUIRES_NEW)
-    public void saveResumption(List<SysResumption> listResumption, List<AppPlan> appPlanList, List<Map<String, Long>> planIdAndOrgs) {
-        //筛选出listResumption每个对象的 planId和orgId 同时在planIdAndOrgs中的数据
-        List<SysResumption> resumptionList = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(planIdAndOrgs) && CollectionUtils.isNotEmpty(listResumption)) {
-            for (SysResumption re : listResumption) {
-                for (Map<String, Long> map : planIdAndOrgs) {
-                    if (!(re.getPlanId().equals(map.get("planId")) && re.getOrgId().equals(map.get("orgId")))) {
-                        resumptionList.add(re);
-                    }
-                }
-            }
-        } else {
-            resumptionList = listResumption;
-        }
-        //this.save(resumptionList);
-        this.saveBatch(resumptionList);
-        for (SysResumption resumption : resumptionList) {
-            AppPlan appPlan = appPlanList.stream().filter(r -> r.getId().equals(resumption.getPlanId())).collect(Collectors.toList()).get(0);
-            this.daiban(resumption, resumption.getRoleId(), appPlan, resumption.getOrgId(), Math.toIntExact(resumption.getType()));
-        }
-    }
-
-    /**
-     * 查询【请填写功能名称】列表
-     *
-     * @param sysResumption 【请填写功能名称】
-     * @return 【请填写功能名称】
-     */
-    @Override
-    public List<SysResumption> selectSysResumptionList(SysResumption sysResumption) {
-        return sysResumptionMapper.selectList(new QueryWrapper<>(sysResumption));
-    }
-
-    @Override
-    public List<WorkChangeResumptionVo> findResumptionList(List<Long> orgIds, Date date, Integer type, Integer status, Integer year, Integer quarter) {
-        return sysResumptionMapper.findResumptionList(orgIds, date, type, status, year, quarter);
-    }
-
-    @Override
-    @Transactional(readOnly = false, rollbackFor = {Exception.class, RuntimeException.class}, propagation = Propagation.REQUIRES_NEW)
-    public void newbuild(Long orgId, ResumptionType type, final Date dateTime, final Boolean isWork, AppPlan appPlan, List<Object> nfcList, List<AppRulePointTaskVo> pointList, List<Long> roleIds, DateTime planstartTime, DateTime planendTime) {
-        Ymd ymd = Ymd.of(dateTime);
-        //id使用uuid
-        // final Resumption resumption = this.findOrCreate(id,()-> Resumption.newof(orgId,type,ymd,appPlan.getId(), id));
-        // 原来的id根据规则参数，可以根据规则产生和数据库里已存在的id，
-        // 现在使用uuid，数据库中肯定不存在，故不需要拿id去数据库查询，直接创建新的对象
-        List<SysResumption> resumptions = new ArrayList<>();
-
-        Date time = new Date();
-
-        for (Long roleId : roleIds) {
-            //结束时间 23:59:59变00:00:00的问题(周，月，季，半年，年)
-            if (type.getValue() != 1 && type.getValue() != 2) {
-                planendTime = DateUtil.endOfDay(planendTime).offset(DateField.MILLISECOND, -999);
-            }
-//            String id = UUID.randomUUID().toString().replaceAll("-", "");
-            SysResumption resumption = new SysResumption();
-            //resumption.changeWork(isWork);
-            resumption.setStatus((long) 1);
-            resumption.setYmd(ymd);
-            resumption.setName(appPlan.getPlanName());
-            resumption.setYmdDate(ymd.getDate());
-            resumption.setYmdDay(Long.valueOf(ymd.getDay()));
-            resumption.setYmdMonth(Long.valueOf(ymd.getMonth()));
-            resumption.setYmdWeek(Long.valueOf(ymd.getWeek()));
-            resumption.setYmdYear(Long.valueOf(ymd.getYear()));
-            resumption.setYmdHour(Long.valueOf(ymd.getHour()));
-            resumption.setYmdQuarter(Long.valueOf(ymd.getQuarter()));
-            resumption.setYmdHalfyear(Long.valueOf(ymd.getHalfyear()));
-            resumption.setPlanId((ObjectUtil.equal(appPlan.getParentId(), -1L) || ObjectUtil.isNull(appPlan.getParentId())) ? appPlan.getId() : appPlan.getParentId());
-            resumption.setOrgId(orgId);
-//            resumption.setId(id);
-            resumption.setType(type.getValue());
-            resumption.setRoleId(roleId);
-            resumption.setPlanStartTime(planstartTime);
-            resumption.setPlanEndTime(planendTime);
-            resumption.setCreateTime(time);
-            resumptions.add(resumption);
-        }
-        //resumptions = this.save(resumptions);
-//        for (SysResumption s :
-//                resumptions) {
-//            sysResumptionMapper.insert(s);
-//        }
-        this.saveBatch(resumptions);
-        //resumption = this.save(resumption);
-        //插入履职数据
-//        for (SysResumption resumption : resumptions) {
-//            //生成代办
-//            daiban(resumption, resumption.getRoleId(), appPlan, orgId, type.ordinal());
-//        }
-
-    }
-
-    public void daiban(SysResumption resumption, Long roleId, AppPlan appPlan, Long orgId, int type) {
-        Todo todo = new Todo();
-        Long appId = 0L; //this.appService.findByNameForApp(IApp.SAFECHECK).getId();
-        todo.setId(resumption.getId());
-        todo.setOrgId(orgId);
-
-        String name = appPlan.getPlanName();
-        if (type == 6) {
-            todo.setTitle("每小时履职");
-            SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
-            sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-            name = appPlan.getPlanName() + sdf.format(resumption.getPlanStartTime()) + "-" + sdf.format(resumption.getPlanEndTime());
-//            appId = this.appService.findByNameForApp(IApp.MRLZ).getId();
-        }
-        if (type == 0) {
-            todo.setTitle("每日履职");
-            //SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
-            int planexec = appPlan.getPlanExec();
-            String strplanexec = "";
-            switch (planexec) {
-                case 0:
-                    strplanexec = "(全天)";
-                    break;
-                case 1:
-                    strplanexec = "(营业前)";
-                    break;
-                case 2:
-                    strplanexec = "(营业期间)";
-                    break;
-                case 3:
-                    strplanexec = "(营业终了)";
-                    break;
-            }
-            name = appPlan.getPlanName() + strplanexec;//sdf.format(resumption.getPlanStartTime())+"-"+
-//            appId = this.appService.findByNameForApp(IApp.MRLZ).getId();
-        }
-        if (type == 1) {
-            todo.setTitle("每周履职");
-            name = resumption.getYmd().getYear() + "年第" + resumption.getYmd().getWeek() + "周-" + appPlan.getPlanName();
-//            appId = this.appService.findByNameForApp(IApp.MYLZ).getId();
-        }
-        if (type == 2) {
-            todo.setTitle("每月履职");
-            name = resumption.getYmd().getYear() + "年第" + resumption.getYmd().getMonth() + "月-" + appPlan.getPlanName();
-//            appId = this.appService.findByNameForApp(IApp.MYLZ).getId();
-        }
-        if (type == 3) {
-            todo.setTitle("季度履职");
-            name = resumption.getYmd().getYear() + "年第" + resumption.getYmd().getQuarter() + "季度-" + appPlan.getPlanName();
-//            appId = this.appService.findByNameForApp(IApp.MNLZ).getId();
-        }
-        if (type == 4) {
-            todo.setTitle("半年履职");
-            String strhalfyear = "";
-            switch (resumption.getYmd().getHalfyear()) {
-                case 1:
-                    strhalfyear = "上半年";
-                    break;
-                case 2:
-                    strhalfyear = "下半年";
-                    break;
-            }
-            name = resumption.getYmd().getYear() + "年" + strhalfyear + "-" + appPlan.getPlanName();
-//            appId = this.appService.findByNameForApp(IApp.MNLZ).getId();
-        }
-        if (type == 5) {
-            todo.setTitle("年度履职");
-            name = resumption.getYmd().getYear() + "年-" + appPlan.getPlanName();
-//            appId = this.appService.findByNameForApp(IApp.MNLZ).getId();
-        }
-
-        todo.setContent(String.format("%s-等待履职", name));
-        todo.setDate(resumption.getPlanStartTime());
-        //Date endDate=DateUtils.addMilliseconds( DateUtil.endOfDay(resumption.getPlanEndTime()),-1);
-        todo.setEndDate(DateUtil.endOfDay(resumption.getPlanEndTime()));
-        todo.setOverDate(DateUtil.endOfDay(resumption.getPlanEndTime()));
-        todo.setAppId(appId);
-        todo.setRoles(new ArrayList<>());
-        TodoRole todoRole = new TodoRole();
-        todoRole.setTodoId(todo.getId());
-        todoRole.setRoleId(roleId);
-        todo.getRoles().add(todoRole);
-//        iTodoService.saveTodoAndRoles(todo);
-    }
-
-    /**
-     * 新增【请填写功能名称】
-     *
-     * @param sysResumption 【请填写功能名称】
-     * @return 结果
-     */
-    @Override
-    public int insertSysResumption(SysResumption sysResumption) {
-        sysResumption.setCreateTime(DateUtils.getNowDate());
-        return sysResumptionMapper.insert(sysResumption);
-    }
-
-    /**
-     * 修改【请填写功能名称】
-     *
-     * @param sysResumption 【请填写功能名称】
-     * @return 结果
-     */
-    @Override
-    public int updateSysResumption(SysResumption sysResumption) {
-        sysResumption.setUpdateTime(DateUtils.getNowDate());
-        return sysResumptionMapper.updateById(sysResumption);
-    }
-
-    /**
-     * 批量删除【请填写功能名称】
-     *
-     * @param ids 需要删除的【请填写功能名称】主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSysResumptionByIds(String[] ids) {
-        return sysResumptionMapper.deleteBatchIds(Arrays.asList((ids)));
-    }
-
-    /**
-     * 删除【请填写功能名称】信息
-     *
-     * @param id 【请填写功能名称】主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSysResumptionById(String id) {
-        return sysResumptionMapper.deleteById(id);
-    }
-}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/task/ResumptionTaskBusiness.java

@@ -10,16 +10,14 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.enums.OrgTypeEnum;
-import com.xunmei.common.core.utils.Ymd;
+import com.xunmei.common.core.utils.*;
 import com.xunmei.common.core.utils.snowId.DateHelper;
 import com.xunmei.core.resumption.domain.AppPlan;
-import com.xunmei.core.resumption.domain.SysResumption;
+import com.xunmei.core.resumption.domain.Resumption;
+import com.xunmei.core.resumption.domain.Resumption;
 import com.xunmei.core.resumption.service.AppPlanService;
 import com.xunmei.core.resumption.service.IAppRulePointService;
-import com.xunmei.core.resumption.service.ISysResumptionService;
-import com.xunmei.common.core.utils.KeyValue;
-import com.xunmei.common.core.utils.ResumptionStatus;
-import com.xunmei.common.core.utils.ResumptionType;
+import com.xunmei.core.resumption.service.ResumptionService;
 import com.xunmei.core.resumption.vo.AppRulePointTaskVo;
 import com.xunmei.core.resumption.vo.WorkChangeResumptionVo;
 import com.xunmei.system.api.Eto.OrgListByTypesConditionEto;
@@ -49,7 +47,7 @@ import java.util.stream.Collectors;
 public class ResumptionTaskBusiness {
 
     @Autowired
-    private ISysResumptionService resumptionService;
+    private ResumptionService resumptionService;
     @Autowired
     private RemoteWorkTimeService workTimeService;
     @Autowired
@@ -58,12 +56,9 @@ public class ResumptionTaskBusiness {
     private AppPlanService appPlanService;
     @Autowired
     private IAppRulePointService appRulePointService;
-    @Autowired
-    private RemoteConfigService systemParameService;
 
 
-//    @Resource
-//    DelayTaskService delayTaskService;
+
     /**
      * 添加每小时作息
      *
@@ -696,9 +691,9 @@ public class ResumptionTaskBusiness {
 
     @Async
     public Boolean updateTaskStatus() {
-        LambdaUpdateWrapper<SysResumption> wrapper = new LambdaUpdateWrapper<SysResumption>();
+        LambdaUpdateWrapper<Resumption> wrapper = new LambdaUpdateWrapper<Resumption>();
         Date date = DateUtil.beginOfDay(new Date());
-        wrapper.eq(SysResumption::getStatus, 1).lt(SysResumption::getPlanEndTime, date).set(SysResumption::getStatus, 4);
+        wrapper.eq(Resumption::getStatus, 1).lt(Resumption::getPlanEndTime, date).set(Resumption::getStatus, 4);
         return resumptionService.update(wrapper);
     }
 
@@ -853,7 +848,7 @@ public class ResumptionTaskBusiness {
         List<Map<String, Long>> planIdAndOrgs = new ArrayList<>();
         List<AppPlan> appPlanList = null;
         List<WorkChangeResumptionVo> listDayWwc = null;
-        List<SysResumption> listResumption = new ArrayList<>();
+        List<Resumption> listResumption = new ArrayList<>();
         //已有任务
         if (listDay != null && listDay.size() > 0) {
             //获取未完成的任务
@@ -917,7 +912,7 @@ public class ResumptionTaskBusiness {
                     Map<String, DateTime> map = this.buildDayPlanTiem(appPlan, workTime, dateTime);
                     DateTime planstartTime = map.get("planstartTime");
                     DateTime planendTime = map.get("planendTime");
-                    List<SysResumption> resumptionList = buildResumptionList(orgId, ResumptionType.DAY, dateTime, appPlan, roleIds, planstartTime, planendTime);
+                    List<Resumption> resumptionList = buildResumptionList(orgId, ResumptionType.DAY, dateTime, appPlan, roleIds, planstartTime, planendTime);
                     if (resumptionList != null) {
                         listResumption.addAll(resumptionList);
                     }
@@ -1000,7 +995,7 @@ public class ResumptionTaskBusiness {
         List<AppPlan> appPlanList = null;
         List<AppPlan> appPlanListAll = new ArrayList<>();
         List<WorkChangeResumptionVo> listDaydelete = new ArrayList<>();
-        List<SysResumption> listResumption = new ArrayList<>();
+        List<Resumption> listResumption = new ArrayList<>();
         //将数据按机构分组
         if (listHour != null && listHour.size() > 0) {
             Map<Long, List<WorkChangeResumptionVo>> listHourMap = listHour.stream().collect(Collectors.groupingBy(WorkChangeResumptionVo::getOrgId));
@@ -1037,7 +1032,7 @@ public class ResumptionTaskBusiness {
                     }
 
                     if (appPlanList != null && appPlanList.size() > 0 && workTimesa.size() > 0) {
-                        List<SysResumption> resumptionList = this.buildResumption(appPlanList, workTimesa.get(0), dateTime, key);
+                        List<Resumption> resumptionList = this.buildResumption(appPlanList, workTimesa.get(0), dateTime, key);
                         if (resumptionList != null && resumptionList.size() > 0) {
                             listResumption.addAll(resumptionList);
                         }
@@ -1054,7 +1049,7 @@ public class ResumptionTaskBusiness {
                         appPlanListAll.addAll(appPlanList);
                     }
                     if (appPlanList != null && appPlanList.size() > 0 && workTimesa.size() > 0) {
-                        List<SysResumption> resumptionList = this.buildResumption(appPlanList, workTimesa.get(0), dateTime, key);
+                        List<Resumption> resumptionList = this.buildResumption(appPlanList, workTimesa.get(0), dateTime, key);
                         if (resumptionList != null && resumptionList.size() > 0) {
                             listResumption.addAll(resumptionList);
                         }
@@ -1074,7 +1069,7 @@ public class ResumptionTaskBusiness {
             for (Long orgId : orgIds) {
                 List<SysWorkTime> workTimesa = workTimes.stream().filter(r -> r.getOrgId().equals(orgId)).collect(Collectors.toList());
                 if (appPlanList != null && appPlanList.size() > 0 && workTimesa.size() > 0) {
-                    List<SysResumption> resumptionList = this.buildResumption(appPlanList, workTimesa.get(0), dateTime, orgId);
+                    List<Resumption> resumptionList = this.buildResumption(appPlanList, workTimesa.get(0), dateTime, orgId);
                     if (resumptionList != null && resumptionList.size() > 0) {
                         listResumption.addAll(resumptionList);
                     }
@@ -1092,8 +1087,8 @@ public class ResumptionTaskBusiness {
 
     }
 
-    public List<SysResumption> buildResumption(List<AppPlan> appPlanList, SysWorkTime workTime, DateTime dateTime, Long orgId) {
-        List<SysResumption> resumptions = new ArrayList<>();
+    public List<Resumption> buildResumption(List<AppPlan> appPlanList, SysWorkTime workTime, DateTime dateTime, Long orgId) {
+        List<Resumption> resumptions = new ArrayList<>();
         for (AppPlan appPlan : appPlanList) {
             List<Long> zxOrgIds = getPlanOrgIds(appPlan);
             if (zxOrgIds == null || zxOrgIds.size() <= 0) {//没有检查项不生成履职任务
@@ -1113,7 +1108,7 @@ public class ResumptionTaskBusiness {
             for (Map<String, DateTime> map : mapList) {
                 DateTime planstartTime = map.get("planstartTime");
                 DateTime planendTime = map.get("planendTime");
-                List<SysResumption> resumptionList = buildResumptionList(orgId, ResumptionType.HOUR, dateTime, appPlan, roleIds, planstartTime, planendTime);
+                List<Resumption> resumptionList = buildResumptionList(orgId, ResumptionType.HOUR, dateTime, appPlan, roleIds, planstartTime, planendTime);
                 if (resumptionList != null) {
                     resumptions.addAll(resumptionList);
                 }
@@ -1122,15 +1117,15 @@ public class ResumptionTaskBusiness {
         return resumptions;
     }
 
-    public List<SysResumption> buildResumptionList(final Long orgId, final ResumptionType type, final Date dateTime, AppPlan appPlan, List<Long> roleIds, DateTime planstartTime, DateTime planendTime) {
+    public List<Resumption> buildResumptionList(final Long orgId, final ResumptionType type, final Date dateTime, AppPlan appPlan, List<Long> roleIds, DateTime planstartTime, DateTime planendTime) {
         final Ymd ymd = Ymd.of(dateTime);
-        List<SysResumption> resumptions = new ArrayList<>();
+        List<Resumption> resumptions = new ArrayList<>();
         Date time = new Date();
         for (Long roleId : roleIds) {
             //结束时间 23:59:59变00:00:00的问题(周，月，季，半年，年)
-            String id = UUID.randomUUID().toString().replaceAll("-", "");
-            SysResumption resumption = new SysResumption();
-            resumption.setStatus((long) ResumptionStatus.WAIT.ordinal());
+//            String id = UUID.randomUUID().toString().replaceAll("-", "");
+            Resumption resumption = new Resumption();
+            resumption.setStatus( ResumptionStatus.WAIT.ordinal());
             resumption.setYmd(ymd);
             resumption.setPlanId(appPlan.getId());
             resumption.setType(type.getValue());
@@ -1139,7 +1134,7 @@ public class ResumptionTaskBusiness {
             resumption.setPlanEndTime(planendTime);
             resumption.setCreateTime(time);
             resumption.setOrgId(orgId);
-            resumption.setId(id);
+            resumption.setId(IDHelper.id());
             resumptions.add(resumption);
 
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/mapper/CoreMonitoringRetrievalTaskMapper.java

@@ -84,6 +84,8 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
     void updateTaskStart(@Param("dateTimeNew") Date dateTimeNew);
 
     void deleteTaskByPlanId(@Param("planId") Long planId);
+
+
     void deleteWaitTaskByPlanId(@Param("planId") Long planId);
 
     void updateDeleteTaskByPlanId(@Param("planId") Long planId,@Param("isDeleted") Integer isDeleted);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/CoreSafecheckPlanController.java

@@ -100,7 +100,7 @@ public class CoreSafecheckPlanController extends BaseController {
         return toAjax(coreSafecheckPlanService.updateCoreSafecheckPlan(coreSafecheckPlan));
     }
     @PostMapping("/distribute")
-//    @RequiresPermissions("core:checkplan:distribute")
+    @RequiresPermissions("core:checkplan:distribute")
     public AjaxResult distribute(@RequestBody DistributeDto dto) {
         try {
             coreSafecheckPlanService.distributeToOrg(dto);

soc-modules/soc-modules-core/src/main/resources/mapper/access/TMonitoringRetrievalPlanMapper.xml

@@ -218,6 +218,19 @@
         </trim>
         where id = #{id}
     </update>
+    <update id="updatePlan">
+        UPDATE core_monitoring_retrieval_plan
+        SET is_deleted = '2'
+        WHERE
+                id IN (SELECT id FROM(	SELECT
+                                              id
+                                          FROM
+                                              core_monitoring_retrieval_plan
+                                          WHERE
+                                              id = #{id}
+                                             OR parent_id = #{id})b
+            )
+    </update>
 
     <delete id="deleteTMonitoringRetrievalPlanById" parameterType="Long">
         delete

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

@@ -14,6 +14,13 @@
         <!--          and ymd_year = #{resumption.ymd.year}-->
         <!--          and ymd_quarter = #{resumption.ymd.quarter}-->
     </update>
+    <delete id="deleteResumption">
+        delete from core_resumption where ymd_year = #{year} and ymd_quarter=#{quarter} and id in
+        <foreach collection="ids" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </delete>
 
 
     <select id="findDayTaskList" resultType="java.util.Map">
@@ -142,4 +149,16 @@
           AND a.plan_end_time like concat(#{planEndTime}, '%')
 
     </select>
+    <select id="findResumptionList" resultType="com.xunmei.core.resumption.vo.WorkChangeResumptionVo">
+        select a.id,b.id as planId,b.plan_exec as planExec,a.status,a.org_id as orgId
+        from core_resumption a left join core_resumption_plan b on a.plan_id =b.id
+        where a.ymd_year = #{year} and a.ymd_quarter=#{quarter} and a.ymd_date=#{date} and `type`=#{type} and b.plan_exec not in (4,5,6) and a.org_id in
+        <foreach collection="orgIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        <if test="status!=null">
+            and a.status=#{status}
+        </if>
+
+    </select>
 </mapper>

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

@@ -1,347 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.core.resumption.mapper.SysResumptionMapper">
-
-    <resultMap type="com.xunmei.core.resumption.domain.SysResumption" id="SysResumptionResult">
-                <result property="id" column="id"/>
-                <result property="createTime" column="create_time"/>
-                <result property="modifiedId" column="modified_id"/>
-                <result property="modifiedName" column="modified_name"/>
-                <result property="updateTime" column="update_time"/>
-                <result property="exceptionCount" column="exception_count"/>
-                <result property="formType" column="form_type"/>
-                <result property="orgId" column="org_id"/>
-                <result property="status" column="status"/>
-                <result property="type" column="type"/>
-                <result property="ymdDate" column="ymd_date"/>
-                <result property="ymdDay" column="ymd_day"/>
-                <result property="ymdMonth" column="ymd_month"/>
-                <result property="ymdQuarter" column="ymd_quarter"/>
-                <result property="ymdWeek" column="ymd_week"/>
-                <result property="ymdYear" column="ymd_year"/>
-                <result property="ymdHalfyear" column="ymd_halfyear"/>
-                <result property="submitTime" column="submit_time"/>
-                <result property="ymdHour" column="ymd_hour"/>
-                <result property="ymdMinute" column="ymd_minute"/>
-                <result property="planId" column="plan_id"/>
-                <result property="startTime" column="start_time"/>
-                <result property="endTime" column="end_time"/>
-                <result property="planStartTime" column="plan_start_time"/>
-                <result property="planEndTime" column="plan_end_time"/>
-                <result property="roleId" column="role_id"/>
-    </resultMap>
-
-    <sql id="selectSysResumptionVo">
-        select id, create_time, modified_id, modified_name, update_time, exception_count, form_type, org_id, status, type, ymd_date, ymd_day, ymd_month, ymd_quarter, ymd_week, ymd_year, ymd_halfyear, submit_time, ymd_hour, ymd_minute, plan_id, start_time, end_time, plan_start_time, plan_end_time, role_id
-        from core_resumption
-    </sql>
-
-    <select id="selectSysResumptionList" parameterType="com.xunmei.core.resumption.domain.SysResumption"
-            resultMap="SysResumptionResult">
-        <include refid="selectSysResumptionVo"/>
-        <where>
-                        <if test="modifiedId != null ">
-                            and modified_id = #{modifiedId}
-                        </if>
-                        <if test="modifiedName != null  and modifiedName != ''">
-                            and modified_name like concat('%', #{modifiedName}, '%')
-                        </if>
-                        <if test="exceptionCount != null ">
-                            and exception_count = #{exceptionCount}
-                        </if>
-                        <if test="formType != null ">
-                            and form_type = #{formType}
-                        </if>
-                        <if test="orgId != null ">
-                            and org_id = #{orgId}
-                        </if>
-                        <if test="status != null ">
-                            and status = #{status}
-                        </if>
-                        <if test="type != null ">
-                            and type = #{type}
-                        </if>
-                        <if test="ymdDate != null ">
-                            and ymd_date = #{ymdDate}
-                        </if>
-                        <if test="ymdDay != null ">
-                            and ymd_day = #{ymdDay}
-                        </if>
-                        <if test="ymdMonth != null ">
-                            and ymd_month = #{ymdMonth}
-                        </if>
-                        <if test="ymdQuarter != null ">
-                            and ymd_quarter = #{ymdQuarter}
-                        </if>
-                        <if test="ymdWeek != null ">
-                            and ymd_week = #{ymdWeek}
-                        </if>
-                        <if test="ymdYear != null ">
-                            and ymd_year = #{ymdYear}
-                        </if>
-                        <if test="ymdHalfyear != null ">
-                            and ymd_halfyear = #{ymdHalfyear}
-                        </if>
-                        <if test="submitTime != null ">
-                            and submit_time = #{submitTime}
-                        </if>
-                        <if test="ymdHour != null ">
-                            and ymd_hour = #{ymdHour}
-                        </if>
-                        <if test="ymdMinute != null ">
-                            and ymd_minute = #{ymdMinute}
-                        </if>
-                        <if test="planId != null ">
-                            and plan_id = #{planId}
-                        </if>
-                        <if test="startTime != null ">
-                            and start_time = #{startTime}
-                        </if>
-                        <if test="endTime != null ">
-                            and end_time = #{endTime}
-                        </if>
-                        <if test="planStartTime != null ">
-                            and plan_start_time = #{planStartTime}
-                        </if>
-                        <if test="planEndTime != null ">
-                            and plan_end_time = #{planEndTime}
-                        </if>
-                        <if test="roleId != null ">
-                            and role_id = #{roleId}
-                        </if>
-        </where>
-    </select>
-
-    <select id="selectSysResumptionById" parameterType="String"
-            resultMap="SysResumptionResult">
-            <include refid="selectSysResumptionVo"/>
-            where id = #{id}
-    </select>
-    <select id="findResumptionList" resultType="com.xunmei.core.resumption.vo.WorkChangeResumptionVo">
-        select a.id,b.id as planId,b.plan_exec as planExec,a.status,a.org_id as orgId
-        from core_resumption a left join core_resumption_plan b on a.plan_id =b.id
-        where a.ymd_year = #{year} and a.ymd_quarter=#{quarter} and a.ymd_date=#{date} and `type`=#{type} and b.plan_exec not in (4,5,6) and a.org_id in
-        <foreach collection="orgIds" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
-        <if test="status!=null">
-            and a.status=#{status}
-        </if>
-
-    </select>
-
-    <insert id="insertSysResumption" parameterType="com.xunmei.core.resumption.domain.SysResumption">
-        insert into core_resumption
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="id != null">id,
-                    </if>
-                    <if test="createTime != null">create_time,
-                    </if>
-                    <if test="modifiedId != null">modified_id,
-                    </if>
-                    <if test="modifiedName != null">modified_name,
-                    </if>
-                    <if test="updateTime != null">update_time,
-                    </if>
-                    <if test="exceptionCount != null">exception_count,
-                    </if>
-                    <if test="formType != null">form_type,
-                    </if>
-                    <if test="orgId != null">org_id,
-                    </if>
-                    <if test="status != null">status,
-                    </if>
-                    <if test="type != null">type,
-                    </if>
-                    <if test="ymdDate != null">ymd_date,
-                    </if>
-                    <if test="ymdDay != null">ymd_day,
-                    </if>
-                    <if test="ymdMonth != null">ymd_month,
-                    </if>
-                    <if test="ymdQuarter != null">ymd_quarter,
-                    </if>
-                    <if test="ymdWeek != null">ymd_week,
-                    </if>
-                    <if test="ymdYear != null">ymd_year,
-                    </if>
-                    <if test="ymdHalfyear != null">ymd_halfyear,
-                    </if>
-                    <if test="submitTime != null">submit_time,
-                    </if>
-                    <if test="ymdHour != null">ymd_hour,
-                    </if>
-                    <if test="ymdMinute != null">ymd_minute,
-                    </if>
-                    <if test="planId != null">plan_id,
-                    </if>
-                    <if test="startTime != null">start_time,
-                    </if>
-                    <if test="endTime != null">end_time,
-                    </if>
-                    <if test="planStartTime != null">plan_start_time,
-                    </if>
-                    <if test="planEndTime != null">plan_end_time,
-                    </if>
-                    <if test="roleId != null">role_id,
-                    </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="id != null">#{id},
-                    </if>
-                    <if test="createTime != null">#{createTime},
-                    </if>
-                    <if test="modifiedId != null">#{modifiedId},
-                    </if>
-                    <if test="modifiedName != null">#{modifiedName},
-                    </if>
-                    <if test="updateTime != null">#{updateTime},
-                    </if>
-                    <if test="exceptionCount != null">#{exceptionCount},
-                    </if>
-                    <if test="formType != null">#{formType},
-                    </if>
-                    <if test="orgId != null">#{orgId},
-                    </if>
-                    <if test="status != null">#{status},
-                    </if>
-                    <if test="type != null">#{type},
-                    </if>
-                    <if test="ymdDate != null">#{ymdDate},
-                    </if>
-                    <if test="ymdDay != null">#{ymdDay},
-                    </if>
-                    <if test="ymdMonth != null">#{ymdMonth},
-                    </if>
-                    <if test="ymdQuarter != null">#{ymdQuarter},
-                    </if>
-                    <if test="ymdWeek != null">#{ymdWeek},
-                    </if>
-                    <if test="ymdYear != null">#{ymdYear},
-                    </if>
-                    <if test="ymdHalfyear != null">#{ymdHalfyear},
-                    </if>
-                    <if test="submitTime != null">#{submitTime},
-                    </if>
-                    <if test="ymdHour != null">#{ymdHour},
-                    </if>
-                    <if test="ymdMinute != null">#{ymdMinute},
-                    </if>
-                    <if test="planId != null">#{planId},
-                    </if>
-                    <if test="startTime != null">#{startTime},
-                    </if>
-                    <if test="endTime != null">#{endTime},
-                    </if>
-                    <if test="planStartTime != null">#{planStartTime},
-                    </if>
-                    <if test="planEndTime != null">#{planEndTime},
-                    </if>
-                    <if test="roleId != null">#{roleId},
-                    </if>
-        </trim>
-    </insert>
-
-    <update id="updateSysResumption" parameterType="com.xunmei.core.resumption.domain.SysResumption">
-        update core_resumption
-        <trim prefix="SET" suffixOverrides=",">
-                    <if test="createTime != null">create_time =
-                        #{createTime},
-                    </if>
-                    <if test="modifiedId != null">modified_id =
-                        #{modifiedId},
-                    </if>
-                    <if test="modifiedName != null">modified_name =
-                        #{modifiedName},
-                    </if>
-                    <if test="updateTime != null">update_time =
-                        #{updateTime},
-                    </if>
-                    <if test="exceptionCount != null">exception_count =
-                        #{exceptionCount},
-                    </if>
-                    <if test="formType != null">form_type =
-                        #{formType},
-                    </if>
-                    <if test="orgId != null">org_id =
-                        #{orgId},
-                    </if>
-                    <if test="status != null">status =
-                        #{status},
-                    </if>
-                    <if test="type != null">type =
-                        #{type},
-                    </if>
-                    <if test="ymdDate != null">ymd_date =
-                        #{ymdDate},
-                    </if>
-                    <if test="ymdDay != null">ymd_day =
-                        #{ymdDay},
-                    </if>
-                    <if test="ymdMonth != null">ymd_month =
-                        #{ymdMonth},
-                    </if>
-                    <if test="ymdQuarter != null">ymd_quarter =
-                        #{ymdQuarter},
-                    </if>
-                    <if test="ymdWeek != null">ymd_week =
-                        #{ymdWeek},
-                    </if>
-                    <if test="ymdYear != null">ymd_year =
-                        #{ymdYear},
-                    </if>
-                    <if test="ymdHalfyear != null">ymd_halfyear =
-                        #{ymdHalfyear},
-                    </if>
-                    <if test="submitTime != null">submit_time =
-                        #{submitTime},
-                    </if>
-                    <if test="ymdHour != null">ymd_hour =
-                        #{ymdHour},
-                    </if>
-                    <if test="ymdMinute != null">ymd_minute =
-                        #{ymdMinute},
-                    </if>
-                    <if test="planId != null">plan_id =
-                        #{planId},
-                    </if>
-                    <if test="startTime != null">start_time =
-                        #{startTime},
-                    </if>
-                    <if test="endTime != null">end_time =
-                        #{endTime},
-                    </if>
-                    <if test="planStartTime != null">plan_start_time =
-                        #{planStartTime},
-                    </if>
-                    <if test="planEndTime != null">plan_end_time =
-                        #{planEndTime},
-                    </if>
-                    <if test="roleId != null">role_id =
-                        #{roleId},
-                    </if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteSysResumptionById" parameterType="String">
-        delete
-        from core_resumption where id = #{id}
-    </delete>
-
-    <delete id="deleteSysResumptionByIds" parameterType="String">
-        delete from core_resumption where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-    <delete id="deleteResumption">
-        delete from core_resumption where ymd_year = #{year} and ymd_quarter=#{quarter} and id in
-        <foreach collection="ids" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
-
-    </delete>
-</mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -128,7 +128,7 @@
         *
         FROM
         core_monitoring_retrieval_task
-        WHERE 1=1 and  is_deleted=0
+        WHERE 1=1 and is_deleted=0
         <if test="request.orgId != null ">
             and org_id = #{request.orgId}
         </if>
@@ -401,13 +401,25 @@
         </foreach>
     </delete>
     <delete id="deleteTaskByPlanId">
-        delete from core_monitoring_retrieval_task where plan_id = #{planId} and status  in (0,3)
+        delete
+        from core_monitoring_retrieval_task
+        where plan_id = #{planId}
+          and status in (0, 3)
     </delete>
     <delete id="deleteWaitTaskByPlanId">
-        delete from core_monitoring_retrieval_task where plan_id = #{planId} and status  =0
+        DELETE
+        FROM core_monitoring_retrieval_task
+        WHERE plan_id IN (SELECT id
+                          FROM (SELECT id
+                                FROM core_monitoring_retrieval_plan
+                                WHERE id = #{planId}
+                                   OR parent_id = #{planId}) b)
+          and status in (0, 3)
     </delete>
 
     <update id="updateDeleteTaskByPlanId">
-        update core_monitoring_retrieval_task set is_deleted = #{isDeleted} where plan_id = #{planId}
+        update core_monitoring_retrieval_task
+        set is_deleted = #{isDeleted}
+        where plan_id = #{planId}
     </update>
 </mapper>