调整履职

project_data/sql/0.0.2/soc/soc.sql

@@ -1644,6 +1644,10 @@ INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type
 INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 2, '区域外', '0', 'org_extend_is', NULL, 'default', 'N', '0', '超级管理员', '2023-09-15 09:49:08', '省联社账号', '2023-10-16 14:24:59', NULL);
 DELETE from `sys_dict_data` WHERE dict_type='sys_org_type' and dict_label='其他';
 INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 1000, '其他', '9', 'sys_org_type', NULL, 'default', 'N', '0', '超级管理员', '2023-09-17 00:13:26', '超级管理员', '2023-09-17 00:13:37', NULL);
+DELETE from `sys_dict_data` WHERE dict_type='resumption_plan_status';
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 1, '使用中', '1', 'resumption_plan_status', NULL, 'default', 'N', '0', '何悦', '2023-08-29 10:25:18', '省联社账号', '2023-10-16 18:19:52', NULL);
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 2, '草稿', '0', 'resumption_plan_status', NULL, 'default', 'N', '0', '何悦', '2023-08-29 10:25:29', '省联社账号', '2023-10-16 18:19:59', NULL);
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 0, '停用', '2', 'resumption_plan_status', NULL, 'default', 'N', '0', '省联社账号', '2023-10-16 18:20:15', '', NULL, NULL);
 
 
 

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

@@ -54,7 +54,7 @@ public class ApiPlanController {
     @PostMapping("/find")
     @RequiresPermissions("core:plan:find")
     public TableDataInfo page(@RequestBody CoreResumptionPlanPageDto info) {
-        if(ObjectUtil.isNull(info.getOrgId())){
+        if (ObjectUtil.isNull(info.getOrgId())) {
             info.setOrgId(SecurityUtils.getLoginUser().getOrgId());
         }
         return TableDataInfo.success(appPlanService.selectPage(info));
@@ -115,7 +115,7 @@ public class ApiPlanController {
         try {
             appPlanService.saveOrUpdatePlan(info);
             //立即执行
-            if (info.isBuildTaskNow()){
+            if (info.isBuildTaskNow()) {
                 DateTime datetime = new DateTime();
                 datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
                 //当有周期存在时保持原有接口不变（doTask），否则按照新的接口创建
@@ -165,6 +165,14 @@ public class ApiPlanController {
         return AjaxResult.success(app);
     }
 
+    @ApiOperation(value = "撤回")
+    @GetMapping(value = "/cheHui/{id}")
+    @RequiresPermissions("core:plan:findById")
+    public AjaxResult cheHui(@PathVariable Long id) {
+         appPlanService.cheHui(id);
+        return AjaxResult.success();
+    }
+
     @ApiOperation(value = "获取详情")
     @GetMapping(value = "/getPointIds/{id}")
 //    @RequiresPermissions("core:plan:findById")

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

@@ -82,4 +82,6 @@ public interface AppPlanService extends IService<AppPlan> {
     List<Long> findRoleByPlan(Long id);
 
     void distributeToOrg(DistributeDto dto);
+
+    void cheHui(Long id);
 }

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

@@ -143,7 +143,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
 
             AppPlan plan = baseMapper.selectById(dto.getId());
             plan.setOrgId(d.getOrgId().toString());
-            plan.setDistributeStatus("1");
+            plan.setDistributeStatus("0");
             plan.setPlanOfOrgId(d.getOrgId());
             plan.setPlanStatus(d.getStatus());
             plan.setDistributePlanStatus(d.getStatus().toString());
@@ -182,6 +182,21 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         baseMapper.updateById(plan);
     }
 
+    @Override
+    public void cheHui(Long id) {
+        AppPlan plan = baseMapper.selectById(id);
+        //修改所有子计划
+        List<AppPlan> appPlans = baseMapper.selectList(new LambdaQueryWrapper<AppPlan>().eq(AppPlan::getParentId, id));
+        for (AppPlan ap :
+                appPlans) {
+//修改计划状态为停用
+                ap.setPlanStatus(2);
+            baseMapper.updateById(ap);
+        }
+        plan.setDistribute("2");
+        baseMapper.updateById(plan);
+    }
+
     /**
      * 获取检查要点分页
      *
@@ -316,7 +331,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
                 ap.setPlanName(plan.getPlanName());
                 ap.setPlanType(plan.getPlanType());
                 ap.setPlanCycle(plan.getPlanCycle());
-                ap.setPlanStatus(plan.getPlanStatus());
+//                ap.setPlanStatus(plan.getPlanStatus());
                 ap.setExecOrgType(plan.getExecOrgType());
                 ap.setPlanExec(plan.getPlanExec());
                 ap.setModifiedBy(SecurityUtils.getUserId());
@@ -418,7 +433,9 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             //最后处理本计划
             plan.setUpdateTime(new Date());
             plan.setModifiedBy(SecurityUtils.getUserId());
+
             //前端总是会传递计划创建id,修改时需要排除
+            plan.setPlanStatus(null);
             plan.setPlanCreateOrgId(null);
             plan.setPlanCreateOrgName(null);
             baseMapper.updateById(plan);