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

project_data/sql/0.0.2/soc/soc.sql

@@ -1068,6 +1068,12 @@ END IF;
 
     END IF;
 
+    -- 履职计划所属机构类型
+    IF
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_resumption_plan' AND COLUMN_NAME = 'plan_of_org_type' ) THEN
+        ALTER TABLE `core_resumption_plan` ADD COLUMN `plan_of_org_type` INT NULL DEFAULT NULL COMMENT '所属机构类型';
+
+    END IF;
 	-- 履职任务NFC表增加submitby
     IF
         NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_resumption_data_nfc' AND COLUMN_NAME = 'submit_by' ) THEN

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/event/WorkTimeChangeEvent.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import org.springframework.context.ApplicationEvent;
 
+import java.util.Date;
 import java.util.List;
 
 
@@ -12,15 +13,13 @@ public class WorkTimeChangeEvent extends ApplicationEvent {
 
     @ApiModelProperty(value = "机构id数组", notes = "受影响的机构")
     private final List<Long> orgIds;
+    private final Date ymdDate;
 
-   /* @ApiModelProperty(value = "作息时间列表", notes = "受影响的作息时间列表")
-    private final List<SysWorkTime> dataList;*/
-
-
-    public WorkTimeChangeEvent(Object source, List<Long> orgIds/*, List<SysWorkTime> dataList*/) {
+    public WorkTimeChangeEvent(Object source, List<Long> orgIds,Date ymdDate) {
         super(source);
         this.orgIds = orgIds;
       //  this.dataList = dataList;
+        this.ymdDate = ymdDate;
     }
 
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/listener/WorkTimeChangeEventListener.java

@@ -2,6 +2,7 @@ package com.xunmei.core.listener;
 
 import com.xunmei.common.core.event.WorkTimeChangeEvent;
 import com.xunmei.core.edu.service.ICoreEduTrainingTaskService;
+import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.EventListener;
@@ -14,7 +15,8 @@ public class WorkTimeChangeEventListener implements ApplicationListener<WorkTime
 
     @Autowired
     private ICoreEduTrainingTaskService coreEduTrainingTaskService;
-
+    @Autowired
+    private ICoreMonitoringRetrievalTaskService coreMonitoringRetrievalTaskService;
     @Override
     @EventListener(WorkTimeChangeEvent.class)
     @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT,fallbackExecution = true)
@@ -22,6 +24,6 @@ public class WorkTimeChangeEventListener implements ApplicationListener<WorkTime
 
         coreEduTrainingTaskService.taskChangeForTimeWorkChange(event);
 
-
+        coreMonitoringRetrievalTaskService.taskChangeForTimeWorkChange(event);
     }
 }

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

@@ -70,12 +70,11 @@ public class ApiPlanController {
     public AjaxResult distribute(@RequestBody DistributeDto dto) {
         try {
             appPlanService.distributeToOrg(dto);
-            AppPlanVo plan = appPlanService.findById(dto.getId());
+            AppPlan plan = appPlanService.getById(dto.getId());
             //如果选择了计划立即生效
             if (plan.getBuildTaskNow()==1) {
                 DateTime datetime = new DateTime();
                 datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-                //当有周期存在时保持原有接口不变（doTask），否则按照新的接口创建
                 Integer plancycle = plan.getPlanCycle();
                 if (plancycle != null) {
                     if (plancycle == 2) {
@@ -147,33 +146,46 @@ public class ApiPlanController {
     public AjaxResult edit(@RequestBody AppPlanVo info) {
         try {
             appPlanService.saveOrUpdatePlan(info);
-            //立即执行
-            if (info.getExecOrgType()==3&&info.getBuildTaskNow()==1) {
-                DateTime datetime = new DateTime();
-                datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-                //当有周期存在时保持原有接口不变（doTask），否则按照新的接口创建
-                Integer plancycle = info.getPlanCycle();
-                if (plancycle != null) {
-                    if (plancycle == 2) {
-                        taskBusiness.syncDay(datetime, plancycle);
-                    }
-                    if (plancycle == 3) {
-                        taskBusiness.syncWeek(datetime, plancycle);
-                    }
-                    if (plancycle == 4) {
-                        taskBusiness.syncMonth(datetime, plancycle);
-                    }
-                    if (plancycle == 5) {
-                        taskBusiness.syncQuarter(datetime, plancycle);
-                    }
-                    if (plancycle == 6) {
-                        taskBusiness.syncHalfYear(datetime, plancycle);
-                    }
-                    if (plancycle == 7) {
-                        taskBusiness.syncYear(datetime, plancycle);
+            Long planOfOrgType = null;
+            if (info.getId()==null){
+                Long orgId = info.getPlanCreateOrgId();
+                planOfOrgType = Long.valueOf(remoteOrgService.selectSysOrgById(orgId, SecurityConstants.INNER).getType());
+            }else {
+                AppPlan plan = appPlanService.getById(info.getId());
+                planOfOrgType = plan.getPlanOfOrgType();
+            }
+            //判断是否是编辑并且计划所属任务不存在已完成或者逾期,需要删除所有任务重新生成
+            boolean isEditAll = info.getHasEdit() == null&&info.getId()!=null;
+            //如果计划所属机构类型为行社并且勾选立即执行,新增的时候立即生成任务
+            if ((info.getId()==null&&planOfOrgType==3&&info.getBuildTaskNow()==1)||isEditAll){
+                    DateTime datetime = new DateTime();
+                    datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+                    //当有周期存在时保持原有接口不变（doTask），否则按照新的接口创建
+                    Integer plancycle = info.getPlanCycle();
+                    if (plancycle != null) {
+                        if (plancycle == 2) {
+                            taskBusiness.syncDay(datetime, plancycle);
+                        }
+                        if (plancycle == 3) {
+                            taskBusiness.syncWeek(datetime, plancycle);
+                        }
+                        if (plancycle == 4) {
+                            taskBusiness.syncMonth(datetime, plancycle);
+                        }
+                        if (plancycle == 5) {
+                            taskBusiness.syncQuarter(datetime, plancycle);
+                        }
+                        if (plancycle == 6) {
+                            taskBusiness.syncHalfYear(datetime, plancycle);
+                        }
+                        if (plancycle == 7) {
+                            taskBusiness.syncYear(datetime, plancycle);
+                        }
                     }
-                }
+
             }
+
+
             return AjaxResult.success();
         } catch (Exception e) {
             e.printStackTrace();
@@ -209,7 +221,36 @@ public class ApiPlanController {
     @GetMapping(value = "/distributeCheHui/{id}")
 //    @RequiresPermissions("core:plan:findById")
     public AjaxResult distributeCheHui(@PathVariable Long id) {
-        return AjaxResult.success(appPlanService.distributeCheHui(id));
+        int i = appPlanService.distributeCheHui(id);
+        AppPlan plan = appPlanService.getById(id);
+        //撤回后的下发如果存在子计划并且勾选立即执行也需要生成任务
+        if(i>0&&plan.getBuildTaskNow()==1){
+            DateTime datetime = new DateTime();
+            datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+            //当有周期存在时保持原有接口不变（doTask），否则按照新的接口创建
+            Integer plancycle = plan.getPlanCycle();
+            if (plancycle != null) {
+                if (plancycle == 2) {
+                    taskBusiness.syncDay(datetime, plancycle);
+                }
+                if (plancycle == 3) {
+                    taskBusiness.syncWeek(datetime, plancycle);
+                }
+                if (plancycle == 4) {
+                    taskBusiness.syncMonth(datetime, plancycle);
+                }
+                if (plancycle == 5) {
+                    taskBusiness.syncQuarter(datetime, plancycle);
+                }
+                if (plancycle == 6) {
+                    taskBusiness.syncHalfYear(datetime, plancycle);
+                }
+                if (plancycle == 7) {
+                    taskBusiness.syncYear(datetime, plancycle);
+                }
+            }
+        }
+        return AjaxResult.success(i);
     }
 
     @ApiOperation(value = "获取详情")

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

@@ -102,6 +102,10 @@ public class AppPlan extends Model<AppPlan> implements Serializable {
      */
     private Long planOfOrgId;
     /**
+     * 计划所属机构类型
+     */
+    private Long planOfOrgType;
+    /**
      * 计划执行次数
      */
     private String count;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/listener/WorkTimeChangeEventListener.java

@@ -1,27 +0,0 @@
-package com.xunmei.core.resumption.listener;
-
-import com.xunmei.common.core.event.WorkTimeChangeEvent;
-import com.xunmei.core.edu.service.ICoreEduTrainingTaskService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.EventListener;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.event.TransactionPhase;
-import org.springframework.transaction.event.TransactionalEventListener;
-
-@Component
-public class WorkTimeChangeEventListener implements ApplicationListener<WorkTimeChangeEvent> {
-
-    @Autowired
-    private ICoreEduTrainingTaskService coreEduTrainingTaskService;
-
-    @Override
-    @EventListener(WorkTimeChangeEvent.class)
-    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
-    public void onApplicationEvent(WorkTimeChangeEvent event) {
-
-        coreEduTrainingTaskService.taskChangeForTimeWorkChange(event);
-
-
-    }
-}

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

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.domain.DateRange;
+import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.resumption.domain.*;
 import com.xunmei.core.resumption.dto.DistributeDto;
@@ -138,47 +140,53 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
 
     @Override
     public void distributeToOrg(DistributeDto dto) {
-        for (DistributeStatusDto d :
-                dto.getOrgAndStatus()) {
-
-            AppPlan plan = baseMapper.selectById(dto.getId());
-            plan.setOrgId(d.getOrgId().toString());
-            plan.setDistributeStatus("1");
-            plan.setPlanOfOrgId(d.getOrgId());
-            plan.setPlanStatus(d.getStatus());
-            plan.setDistributePlanStatus(d.getStatus().toString());
-            plan.setCreateTime(new Date());
-            plan.setId(null);
+        //如果计划所属机构类型为省联社,生成下发子计划
+        if (baseMapper.selectById(dto.getId()).getPlanOfOrgType() == 1) {
+            for (DistributeStatusDto d :
+                    dto.getOrgAndStatus()) {
+
+                AppPlan plan = baseMapper.selectById(dto.getId());
+                plan.setOrgId(d.getOrgId().toString());
+                plan.setDistributeStatus("1");
+                plan.setPlanOfOrgId(d.getOrgId());
+                plan.setPlanOfOrgType(Long.valueOf(orgService.selectSysOrgById(d.getOrgId(), SecurityConstants.INNER).getType()));
+                plan.setPlanStatus(d.getStatus());
+                plan.setDistributePlanStatus(d.getStatus().toString());
+                plan.setCreateTime(new Date());
+                plan.setId(null);
 //            plan.setPlanName(plan.getPlanName()+"下发"+orgService.selectOrgById(d.getOrgId(),SecurityConstants.INNER).getName());
-            plan.setPlanName(plan.getPlanName());
-            plan.setParentId(dto.getId());
-            baseMapper.insert(plan);
-            Long id = plan.getId();
+                plan.setPlanName(plan.getPlanName());
+                plan.setParentId(dto.getId());
+                baseMapper.insert(plan);
+                Long id = plan.getId();
 
-            List<Long> roleList = appPlanToRoleMapper.selectList(new LambdaQueryWrapper<AppPlanToRole>().eq(AppPlanToRole::getPlanId, dto.getId())).stream().map(AppPlanToRole::getRoleId).collect(Collectors.toList());
-            AppPlanToRole atr = null;
-            for (Long roleId : roleList) {
-                atr = new AppPlanToRole();
-                atr.setRoleId(roleId);
-                atr.setPlanId(id);
-                appPlanToRoleMapper.insert(atr);
-            }
+                List<Long> roleList = appPlanToRoleMapper.selectList(new LambdaQueryWrapper<AppPlanToRole>().eq(AppPlanToRole::getPlanId, dto.getId())).stream().map(AppPlanToRole::getRoleId).collect(Collectors.toList());
+                AppPlanToRole atr = null;
+                for (Long roleId : roleList) {
+                    atr = new AppPlanToRole();
+                    atr.setRoleId(roleId);
+                    atr.setPlanId(id);
+                    appPlanToRoleMapper.insert(atr);
+                }
 
-            List<AppPlanToPoint> itemList = appPlanToItemMapper.selectList(new LambdaQueryWrapper<AppPlanToPoint>().eq(AppPlanToPoint::getPlanId, dto.getId()));
-            AppPlanToPoint item = null;
-            for (AppPlanToPoint ruleItemVo : itemList) {
-                item = new AppPlanToPoint();
-                item.setPointId(ruleItemVo.getPointId());
-                item.setPlanId(id);
-                item.setPointScan(ruleItemVo.isPointScan());
-                item.setRequired(ruleItemVo.isRequired());
-                appPlanToItemMapper.insert(item);
+                List<AppPlanToPoint> itemList = appPlanToItemMapper.selectList(new LambdaQueryWrapper<AppPlanToPoint>().eq(AppPlanToPoint::getPlanId, dto.getId()));
+                AppPlanToPoint item = null;
+                for (AppPlanToPoint ruleItemVo : itemList) {
+                    item = new AppPlanToPoint();
+                    item.setPointId(ruleItemVo.getPointId());
+                    item.setPlanId(id);
+                    item.setPointScan(ruleItemVo.isPointScan());
+                    item.setRequired(ruleItemVo.isRequired());
+                    appPlanToItemMapper.insert(item);
+                }
             }
         }
-        //修改下发标识
+        //更新下发标识
         AppPlan plan = new AppPlan();
         plan.setId(dto.getId());
+        //设置下发状态1
         plan.setDistribute("1");
+        //设置计划状态为使用中
         plan.setPlanStatus(1);
         plan.setBuildTaskNow(null);
         baseMapper.updateById(plan);
@@ -194,12 +202,19 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
 //修改计划状态为停用
             ap.setPlanStatus(2);
             baseMapper.updateById(ap);
+            //撤回需要删除本周期所有任务
+            DateRange dateRange = DateUtils.getStartAndEnd(new Date(), plan.getPlanCycle());
+            resumptionMapper.delete(new LambdaQueryWrapper<Resumption>().eq(Resumption::getPlanId, plan.getId()).between(Resumption::getYmdDate, dateRange.getStartTime(), dateRange.getEndTime()));
+
         }
         //设置下发状态为未下发
         plan.setDistribute("0");
-        plan.setPlanStatus(0);
+        plan.setPlanStatus(2);
         baseMapper.updateById(plan);
 
+//撤回需要删除本周期所有任务
+        DateRange dateRange = DateUtils.getStartAndEnd(new Date(), plan.getPlanCycle());
+        resumptionMapper.delete(new LambdaQueryWrapper<Resumption>().eq(Resumption::getPlanId, plan.getId()).between(Resumption::getYmdDate, dateRange.getStartTime(), dateRange.getEndTime()));
 
     }
 
@@ -281,14 +296,17 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             if (size > 0) {
                 throw new RuntimeException("计划名称重复，请确认！");
             }
-            //如果计划为行社并且勾选立即生效
-            if (app.getExecOrgType() == 3 && app.getBuildTaskNow()==1) {
+
+            plan.setBuildTaskNow(app.getBuildTaskNow());
+            plan.setDistribute("0");
+            //设置计划所属机构类型
+            plan.setPlanOfOrgType(Long.valueOf(orgService.selectSysOrgById(app.getPlanCreateOrgId(), SecurityConstants.INNER).getType()));
+            //如果计划所属机构类型为行社并且勾选立即生效
+            if (plan.getPlanOfOrgType() == 3 && plan.getBuildTaskNow() == 1) {
                 plan.setPlanStatus(1);
             } else {
                 plan.setPlanStatus(0);
             }
-            plan.setBuildTaskNow(app.getBuildTaskNow());
-            plan.setDistribute("0");
             baseMapper.insert(plan);
             Long id = plan.getId();
 
@@ -342,33 +360,34 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
                 app.setRoleList(new ArrayList<>());
             }
 
-            //获取计划对应的已完成任务数量
-            Long num = resumptionMapper.selectCount(new QueryWrapper<Resumption>().eq("plan_id", app.getId()).eq("status", 3));
-            if (num > 0) {
-                //如果状态为已禁用
-                if (app.getPlanStatus() == 0) {
-                    throw new RuntimeException("计划已生成任务，不能禁用！");
-                }
-
-            }
+//            //获取计划对应的已完成任务数量
+//            Long num = resumptionMapper.selectCount(new QueryWrapper<Resumption>().eq("plan_id", app.getId()).eq("status", 3));
+//            if (num > 0) {
+//                //如果状态为已禁用
+//                if (app.getPlanStatus() == 0) {
+//                    throw new RuntimeException("计划已生成任务，不能禁用！");
+//                }
+//
+//            }
 
             //修改所有子计划
             List<AppPlan> appPlans = baseMapper.selectList(new LambdaQueryWrapper<AppPlan>().eq(AppPlan::getParentId, plan.getId()));
             for (AppPlan ap :
                     appPlans) {
-                Long nums = resumptionMapper.selectCount(new QueryWrapper<Resumption>().eq("plan_id", ap.getId()).eq("status", 3));
-                if (nums > 0) {
-                    if (app.getPlanStatus() == 0) {
-                        throw new RuntimeException("计划已生成任务，不能禁用！");
-                    }
-                }
-                ap.setPlanName(plan.getPlanName());
+//                Long nums = resumptionMapper.selectCount(new QueryWrapper<Resumption>().eq("plan_id", ap.getId()).eq("status", 3));
+//                if (nums > 0) {
+//                    if (app.getPlanStatus() == 0) {
+//                        throw new RuntimeException("计划已生成任务，不能禁用！");
+//                    }
+//                }
                 ap.setPlanType(plan.getPlanType());
                 ap.setPlanCycle(plan.getPlanCycle());
 //                ap.setPlanStatus(plan.getPlanStatus());
                 ap.setExecOrgType(plan.getExecOrgType());
                 ap.setPlanExec(plan.getPlanExec());
                 ap.setModifiedBy(SecurityUtils.getUserId());
+                ap.setPlanName(plan.getPlanName());
+
                 baseMapper.updateById(ap);
 
                 if (app.getRoleList().size() > 0) {
@@ -404,7 +423,13 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
                     item.setRequired(ruleItemVo.isRequired());
                     appPlanToItemMapper.insert(item);
                 }
-
+                //如果计划是编辑全部,代表不存在已完成或者逾期的任务,需要删除重新生成
+                if (app.getHasEdit() == null) {
+                    resumptionMapper.delete(new LambdaQueryWrapper<Resumption>().eq(Resumption::getPlanId, ap.getId()));
+                }else {
+                    //否则代表编辑名称,需要同步未进行的任务名称
+                    resumptionMapper.updateNameByPlanId(app.getPlanName(),ap.getId());
+                }
 
             }
 
@@ -473,6 +498,10 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             plan.setPlanCreateOrgId(null);
             plan.setPlanCreateOrgName(null);
             baseMapper.updateById(plan);
+            //如果计划是编辑全部,代表不存在已完成或者逾期的任务,需要删除重新生成
+            if (app.getHasEdit() == null) {
+                resumptionMapper.delete(new LambdaQueryWrapper<Resumption>().eq(Resumption::getPlanId, plan.getId()));
+            }
         }
     }
 
@@ -482,6 +511,27 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         AppPlan appPlan = baseMapper.selectById(id);
 
         AppPlanVo appPlanVo = convertToAppPlanVo(appPlan);
+        //查询计划是否存在对应的状态为完成或者逾期的任务
+        List<Integer> status = new ArrayList<>();
+        status.add(3);
+        status.add(4);
+        Long sum = resumptionMapper.selectCount(new LambdaQueryWrapper<Resumption>().eq(Resumption::getPlanId, id).in(Resumption::getStatus, status));
+        if (sum > 0) {
+            //如果存在完成或者逾期的任务设置编辑状态为1
+            appPlanVo.setHasEdit(1);
+        }
+        //查找子计划是否存在完成或者逾期的任务
+        List<AppPlan> appPlans = baseMapper.selectList(new LambdaQueryWrapper<AppPlan>().eq(AppPlan::getParentId, id));
+        for (AppPlan p :
+                appPlans) {
+            Long csum = resumptionMapper.selectCount(new LambdaQueryWrapper<Resumption>().eq(Resumption::getPlanId, p.getId()).in(Resumption::getStatus, status));
+            if (csum > 0) {
+                //如果存在完成或者逾期的任务设置编辑状态为1
+                appPlanVo.setHasEdit(1);
+                break;
+            }
+        }
+
         SysOrg org = orgService.selectSysOrgById(appPlan.getPlanCreateOrgId(), SecurityConstants.INNER);
         appPlanVo.setPlanCreateOrgType(org.getType());
         QueryWrapper<AppPlanToRole> apr = new QueryWrapper<>();
@@ -531,9 +581,9 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         /**
          * 验证计划是否被应用
          */
-        Long num = resumptionMapper.selectCount(new QueryWrapper<Resumption>().eq("plan_id", id).eq("status", 3));
+        Long num = resumptionMapper.selectCount(new QueryWrapper<Resumption>().eq("plan_id", id).in("status", 3,4));
         if (num > 0) {
-            throw new RuntimeException("计划已生成任务，不能删除！");
+            throw new RuntimeException("计划有已完成或者已逾期的任务，不能被删除。");
         }
         //查找子计划
         List<AppPlan> childrens = baseMapper.selectList(new LambdaQueryWrapper<AppPlan>().eq(AppPlan::getParentId, id));
@@ -543,7 +593,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
                 childrens) {
             Long nums = resumptionMapper.selectCount(new QueryWrapper<Resumption>().eq("plan_id", ap.getId()).eq("status", 3));
             if (nums > 0) {
-                throw new RuntimeException("子计划已生成任务，不能删除！");
+                throw new RuntimeException("子计划有已完成或者已逾期的任务，不能被删除。");
             }
             //删除计划对应的任务
             resumptionMapper.delete(new QueryWrapper<Resumption>().eq("plan_id", ap.getId()));

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

@@ -200,15 +200,11 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<AppPlanM
      */
     @Async
     public void syncDay(final DateTime dateTime, int plancycle) {//plancycle==0
-//        R<SysConfig> officeBuilding_open_allhours = systemParameService.findFirstByCode("officeBuilding_open_allhours", SecurityConstants.INNER);
-//        SysConfig officeAllHourParam = officeBuilding_open_allhours.getData();
         //获取履职计划
         List<AppPlan> AppPlanList = appPlanService.list((new QueryWrapper<AppPlan>()).lambda()
                 .eq(AppPlan::getPlanStatus, 1)
                 .eq(AppPlan::getPlanCycle, plancycle)
                 .in(AppPlan::getPlanOfOrgId, getHangsheOrgIds()));
-//                .eq(AppPlan::getPlanType, 1)
-//                .notIn(AppPlan::getPlanExec, canteenPlanExec));
         for (AppPlan appPlan : AppPlanList) {
             //获取履职计划中对应的检查要点
             List<AppRulePointTaskVo> pointList = appRulePointService.findPointByPlan(appPlan.getId());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appPlan/AppPlanVo.java

@@ -24,6 +24,8 @@ public class AppPlanVo extends PageDto<AppPlan> {
     private List<Long> ids;
     private Long id;
     private Integer buildTaskNow;
+    //涉及编辑内容
+    private Integer hasEdit;
     /**
      * 计划名称
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/ICoreMonitoringRetrievalTaskService.java

@@ -8,6 +8,7 @@ import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTas
 import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
 import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskOneVo;
 import com.xunmei.common.core.domain.safetyindex.domain.CoreSafetyExceptionData;
+import com.xunmei.common.core.event.WorkTimeChangeEvent;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
@@ -115,4 +116,6 @@ public interface ICoreMonitoringRetrievalTaskService extends IService<CoreMonito
     List<PanelListVo> selectCurUserTaskList(PanelListDto panelListDto);
 
     List<CoreSafetyExceptionData> selectMonitorExceptionData(DateTime time);
+
+    void taskChangeForTimeWorkChange(WorkTimeChangeEvent event);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -25,6 +25,7 @@ import com.xunmei.common.core.domain.retrieval.vo.TaskDataVo;
 import com.xunmei.common.core.domain.safetyindex.domain.CoreSafetyExceptionData;
 import com.xunmei.common.core.enums.EduTrainingPlanCycleEnum;
 import com.xunmei.common.core.enums.RetrievalTaskCycle;
+import com.xunmei.common.core.event.WorkTimeChangeEvent;
 import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.Ymd;
@@ -584,6 +585,11 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         return Stream.of(overTimeExceptionData, numsExceptionData).flatMap(Collection::stream).collect(Collectors.toList());
     }
 
+    @Override
+    public void taskChangeForTimeWorkChange(WorkTimeChangeEvent event) {
+
+    }
+
     private boolean checkWorkTime(Date workstartTime, Date workendTime,Long orgId){
         Map<String,Object> map = new HashMap<>();
         map.put("workstartTime",DateUtil.format(workstartTime,"yyyy-MM-dd"));

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

@@ -15,7 +15,7 @@
         <!--          and ymd_quarter = #{resumption.ymd.quarter}-->
     </update>
     <update id="updateNameByPlanId">
-update   core_resumption set name=#{planName} where plan_id =#{planId}
+update   core_resumption set name=#{planName} where plan_id =#{planId} and status in (1,2)
 
 
     </update>

soc-modules/soc-modules-core/src/test/java/com/test/TestController.java

@@ -21,7 +21,7 @@ public class TestController {
     @Test
     public void workTimeChangeEventTest () {
         List<Long> list = new ArrayList<>();
-        WorkTimeChangeEvent event = new WorkTimeChangeEvent(this, list);
-        coreEduTrainingTaskService.taskChangeForTimeWorkChange(event);
+        //WorkTimeChangeEvent event = new WorkTimeChangeEvent(this, list, ymdDate);
+        //coreEduTrainingTaskService.taskChangeForTimeWorkChange(event);
     }
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysWorkTimeController.java

@@ -72,14 +72,12 @@ public class SysWorkTimeController extends BaseController {
 //    @RequiresPermissions("system:set:monthedit")
     @PostMapping("/month/edit")
     public AjaxResult monthedit(@RequestBody WorkTimeMonthEditNewDto sysWorkTimeSet) {
-        // Date today = DateUtil.beginOfDay(new Date());
+
         List<Long> orgIds = sysWorkTimeSet.getOrgIdList();
-        //List<SysWorkTime> exists = sysWorkTimeService.findByYmd(orgIds, today);
-        // List<SysWorkTime> workTimeLists = new ArrayList<>();
         for (Long orgId : orgIds) {
             sysWorkTimeService.batchnew(orgId, sysWorkTimeSet.getWorkTimeList());
         }
-        applicationEventPublisher.publishEvent(new WorkTimeChangeEvent(this, orgIds));
+        //applicationEventPublisher.publishEvent(new WorkTimeChangeEvent(this, orgIds, ymdDate));
 
         return AjaxResult.success();
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeServiceImpl.java

@@ -5,6 +5,8 @@ import cn.hutool.core.collection.ListUtil;
 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.alibaba.fastjson.JSON;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,6 +16,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.worktime.dto.WorkTimeDto;
 import com.xunmei.common.core.event.WorkTimeChangeEvent;
+import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.Ymd;
 import com.xunmei.common.core.web.domain.AjaxResult;
@@ -23,11 +26,13 @@ import com.xunmei.system.api.RemoteResumptionTaskService;
 import com.xunmei.system.api.domain.SysWorkTime;
 import com.xunmei.system.domain.SysWorkTimeSet;
 import com.xunmei.system.dto.SysWorkTimeDto;
+import com.xunmei.system.dto.WorkTimeMonthEditNewDto;
 import com.xunmei.system.mapper.SysWorkTimeMapper;
 import com.xunmei.system.mapper.SysWorkTimeSetMapper;
 import com.xunmei.system.service.ISysOrgService;
 import com.xunmei.system.service.ISysWorkTimeService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -353,7 +358,7 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
                 AjaxResult result = remoteResumptionTaskService.dayTaskByWorkTime(param, SecurityConstants.INNER);
                 log.info("时间{}修改作息远程调用生成履职任务返回{}", new Date(), result.get("msg"));
             }
-
+            applicationEventPublisher.publishEvent(new WorkTimeChangeEvent(this, ListUtil.list(true, s.getOrgId()), s.getYmdDate()));
         }
         return workTimeDtoList;
     }
@@ -403,6 +408,7 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
      * @return 结果
      */
     @Override
+    @Transactional(rollbackFor =  Exception.class)
     public void updateSysWorkTime(SysWorkTime sysWorkTime) {
 
         sysWorkTime.setUpdateTime(DateUtils.getNowDate());
@@ -422,7 +428,7 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
             log.info("时间{}修改作息远程调用生成履职任务返回{}", new Date(), result.get("msg"));
 
         }
-        applicationEventPublisher.publishEvent(new WorkTimeChangeEvent(this, ListUtil.list(true, sysWorkTime.getOrgId())));
+        applicationEventPublisher.publishEvent(new WorkTimeChangeEvent(this, ListUtil.list(true, sysWorkTime.getOrgId()), sysWorkTime.getYmdDate()));
     }
 
     /**
@@ -474,4 +480,5 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
     public int checkWorkTime(Map<String, Object> param) {
         return sysWorkTimeMapper.checkWorkTime(param);
     }
+
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeSetServiceImpl.java

@@ -8,6 +8,7 @@ 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.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -553,4 +554,103 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
     public int deleteSysWorkTimeSetById(Long id) {
         return sysWorkTimeSetMapper.deleteById(id);
     }
+//    /**
+//     * 生成下个月的作息
+//     */
+//    @Transactional(rollbackFor = Exception.class)
+//    public void generateNextMonth() {
+//        Calendar calendar = Calendar.getInstance();
+//        calendar.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+//        System.out.println("============================ work_time_job 1================== : " + calendar.getTime());
+//
+//        calendar.set(Calendar.DAY_OF_MONTH, 1);
+//        calendar.add(Calendar.MONTH, 1);
+//        Integer year = calendar.get(Calendar.YEAR);
+//        generateWorkTime(year, calendar.get(Calendar.MONTH));
+//    }
+//
+//    @Transactional(rollbackFor = Exception.class)
+//    public void generateWorkTime(int year, int month) {
+//        Calendar calendar = Calendar.getInstance();
+//        calendar.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+//        calendar.set(Calendar.DAY_OF_MONTH, 1);
+//        calendar.set(Calendar.MONTH, month);
+//        calendar.set(Calendar.YEAR, year);
+//        System.out.println("============================ work_time_job 1================== : " + calendar.getTime());
+//        List<SysWorkTimeSet> workTimes = this.list(new LambdaQueryWrapper<SysWorkTimeSet>().eq(SysWorkTimeSet::getYear,year));
+//        Map<Long,List<SysWorkTimeSet>> group= workTimes.stream()
+//                .sorted(Comparator.comparing(SysWorkTimeSet::getEffectiveDate).reversed())
+//                .collect(Collectors.groupingBy(w->w.getOrgId()));
+//
+//        final Date date = com.xunmei.common.core.utils.DateHelper.getDate(calendar.getTime());
+//        System.out.println("============================ work_time_job 2================== : " + date);
+//        final com.xunmei.common.core.utils.DateHelper dateTime = new com.xunmei.common.core.utils.DateHelper(date);
+//        final Date start = dateTime.monthStart();
+//        final Date end = dateTime.monthEnd();
+//        final List<DateTime> dateTimeList = DateUtil.rangeToList(start, end, DateField.DAY_OF_MONTH);
+//        System.out.println(JSON.toJSONString(dateTimeList));
+////        HolidayDto holidayDto = new HolidayDto();
+////        holidayDto.setYear(year);
+////        List<Holiday> holidayList = this.holidayService.all(holidayDto);
+////        List<Date> holidayDates = null;
+////        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(holidayList)) {
+////            holidayDates = holidayList.stream().map(p -> p.getYmdDate()).collect(Collectors.toList());
+////        }
+//        List<SysWorkTime> workTimeEditDtoList = new ArrayList<>();
+//        for (DateTime time : dateTimeList) {
+//            Date date1 = time.toJdkDate();
+//            System.out.println("date1:"+date1);
+//            for(Long orgId:group.keySet()) {
+//                Optional<SysWorkTimeSet> ws=   group.get(orgId).stream().filter(w->date1.after(w.getEffectiveDate())||DateUtil.isSameDay(date1,w.getEffectiveDate())).findFirst();
+//                if(!ws.isPresent()){
+//                    continue;
+//                }
+//                SysWorkTimeSet set=ws.get();
+//                List<SysWorkTimeSetDayofweek> temp=ws.get().getDayOfWeeks();
+//                int i = time.dayOfWeek();
+//                SysWorkTimeSetDayofweek dayOfWeekSet = temp.stream().filter(e->e.getDayOfWeek().equals(i)).findFirst().get();
+//                boolean isEnable = ObjectUtil.isNotNull(dayOfWeekSet) && dayOfWeekSet.getIsWorkday();
+//                WorkTimeEditDto dto = new WorkTimeEditDto();
+//                dto.setDate(time);
+//                dto.setOrgId(orgId);
+//                dto.setIsEnable(isEnable);
+//                if (ObjectUtil.isNull(dayOfWeekSet) || !dayOfWeekSet.getIsWorkday()) {
+//                    Optional<WorkTimeSetDayOfWeek> firstWorkDay = set.getDayOfWeeks().stream().filter(f -> f.getIsWorkday()).findFirst();
+//                    if (firstWorkDay.isPresent()) {
+//                        dayOfWeekSet = firstWorkDay.get();
+//                    }
+//                }
+//                //dto.setIsEnable(dayOfWeekSet.getIsWorkday());
+//                workTimeEditDtoList.add(dto);
+//                dto.setWorkTime(dayOfWeekSet.getWorkTime());
+//                dto.setWorkOffTime(dayOfWeekSet.getWorkOffTime());
+//                dto.setOpenTime(dayOfWeekSet.getOpenTime());
+//                dto.setCloseTime(dayOfWeekSet.getCloseTime());
+//                dto.setNoonbreakStart(dayOfWeekSet.getNoonbreakStart());
+//                dto.setNoonbreakEnd(dayOfWeekSet.getNoonbreakEnd());
+//                workTimeEditDtoList.add(dto);
+//            }
+//        }
+//
+//        Map<Long,List<WorkTimeEditDto>> groupDay= workTimeEditDtoList.stream().collect(Collectors.groupingBy(w->w.getOrgId()));
+//        //获取所有机构下个月的按日配置的作息
+//        List<WorkTimeNewVo> list = new ArrayList<>();
+//        list = objectMapper.getNextMonthWorkTime(DateUtil.format(start, "yyyy-MM"));
+//        for(Long orgId:groupDay.keySet()){
+//            List<WorkTimeEditDto> workTimeEditDtos = groupDay.get(orgId);
+//            List<WorkTimeNewVo> workTimeNewVos = list.stream().filter(w -> w.getOrgId().equals(orgId)).collect(Collectors.toList());
+//            //去掉workTimeEditDtos中机构与日期在workTimeNewVos中存在的数据
+//            List<WorkTimeEditDto> list1 = null;
+//            if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(workTimeNewVos)){
+//                list1 = workTimeEditDtos.stream().filter(s -> {
+//                    return workTimeNewVos.stream().noneMatch(f -> f.getOrgId().equals(s.getOrgId()) && f.getYmdDate().equals(s.getDate()));
+//                }).collect(Collectors.toList());
+//            }else{
+//                list1 = workTimeEditDtos;
+//            }
+//
+//            batch(orgId, date, list1);
+//        }
+//
+//    }
 }