1、app端任务编辑、删除

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java

@@ -139,7 +139,7 @@ public class RiskPlanAppController extends BaseController {
     }
 
     /**
-     * 保存计划
+     * 新建计划
      *
      * @param riskPlan 项目id
      * @real_return {@link R<List<LedgerProject>>}
@@ -149,7 +149,32 @@ public class RiskPlanAppController extends BaseController {
         riskPlan.setApproveUserId(getUserId());
         riskPlan.setCreateUserId(getUserId());
         riskPlan.setCreateDeptId(getDeptId());
-        return R.ok(riskPlanService.saveRiskPlan(riskPlan));
+        return R.ok(riskPlanService.saveRiskPlanById(riskPlan));
+    }
+
+    /**
+     * 编辑计划
+     *
+     * @param riskPlan 项目id
+     * @real_return {@link R<List<LedgerProject>>}
+     */
+    @PutMapping()
+    public R<Integer> updateRiskPlan(@RequestBody RiskPlan riskPlan) {
+        riskPlan.setApproveUserId(getUserId());
+        riskPlan.setCreateUserId(getUserId());
+        riskPlan.setCreateDeptId(getDeptId());
+        return R.ok(riskPlanService.updateRiskPlan(riskPlan));
+    }
+
+    /**
+     * 删除计划
+     *
+     * @param id 任务id
+     * @real_return {@link R<List<LedgerProject>>}
+     */
+    @DeleteMapping("/{id}")
+    public R<Integer> deleteById(@PathVariable Long id) {
+        return R.ok(riskPlanService.revokeByPlanId(id,getUserId()));
     }
 
     /**

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanService.java

@@ -84,4 +84,6 @@ public interface IRiskPlanService extends IService<RiskPlan>
     List<RiskPlanAppListDto> getRiskPlanAppListDtoListByApproveUser(Long userId,String status,String result);
 
     List<RiskPlanAppListDto> getRiskPlanAppListDtoListByCreateUserDeptId(Long deptId);
+
+    int saveRiskPlanById(RiskPlan riskPlan);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanUserBuildingService.java

@@ -22,4 +22,6 @@ public interface IRiskPlanUserBuildingService extends IService<RiskPlanUserBuild
     Integer submitByPlanIdAndBuildingId(Long planId, Long buildingId, Long userId);
 
     void updateByRiskPlanAppApproveBuildingDto(Long planId,Long userId, List<RiskPlanAppApproveBuildingDto> buildingDtos);
+
+    void deleteByPlanId(Long planId);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java

@@ -359,6 +359,29 @@ public class RiskPlanServiceImpl extends ServiceImpl<RiskPlanMapper, RiskPlan> i
         return riskPlanMapper.getRiskPlanAppListDtoListByCreateUserDeptId(deptId);
     }
 
+    @Override
+    public int saveRiskPlanById(RiskPlan riskPlan) {
+        //插入主表
+        int i = updateRiskPlan(riskPlan);
+
+        //删除历史
+        riskPlanUserBuildingService.deleteByPlanId(riskPlan.getId());
+
+        //插入计划人员与楼宇关系表
+        List<RiskPlanUserBuilding> list = Arrays.stream(riskPlan.getBuildingIds().split(",")).map(buildingId -> {
+            RiskPlanUserBuilding riskPlanUserBuilding = new RiskPlanUserBuilding();
+            riskPlanUserBuilding.setPlanId(riskPlan.getId());
+            riskPlanUserBuilding.setBuildingId(Long.valueOf(buildingId));
+            riskPlanUserBuilding.setUserIds(riskPlan.getWorkUserIds());
+            riskPlanUserBuilding.setStartTime(new Date());
+            riskPlanUserBuilding.setStatus("wait");
+            return riskPlanUserBuilding;
+        }).collect(Collectors.toList());
+        riskPlanUserBuildingService.saveBatch(list);
+
+        return i;
+    }
+
     private String getNo() {
         Random random = new Random();
         int randomNumber = random.nextInt(1000); // 生成0到999之间的随机数

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanUserBuildingServiceImpl.java

@@ -138,4 +138,11 @@ public class RiskPlanUserBuildingServiceImpl
             updateById(planUserBuilding);
         });
     }
+
+    @Override
+    public void deleteByPlanId(Long planId) {
+        LambdaQueryWrapper<RiskPlanUserBuilding> wrapper = new LambdaQueryWrapper<>();
+        wrapper = wrapper.eq(RiskPlanUserBuilding::getPlanId, planId);
+        remove(wrapper);
+    }
 }