1、修改任务审批接口

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

@@ -401,7 +401,7 @@ public class RiskPlanAppController extends BaseController {
      * @param buildingId 楼宇id
      * @real_return {@link R<Integer>}
      */
-    @PostMapping("/submit/{planId}/{building}")
+    @PostMapping("/submit/{planId}/{buildingId}")
     public R<Integer> submitByPlanIdAndBuildingId(@PathVariable Long planId, @PathVariable Long buildingId) {
         return R.ok(riskPlanUserBuildingService.submitByPlanIdAndBuildingId(planId,buildingId, getUserId()));
     }

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

@@ -42,7 +42,10 @@ public class RiskPlanUserBuildingServiceImpl
     @Override
     public Long countStatusByPlanIdAndStatus(Long planId, String status) {
         LambdaQueryWrapper<RiskPlanUserBuilding> wrapper = new LambdaQueryWrapper<>();
-        wrapper = wrapper.eq(RiskPlanUserBuilding::getPlanId, planId).eq(RiskPlanUserBuilding::getStatus, status);
+        wrapper = wrapper.eq(RiskPlanUserBuilding::getPlanId, planId);
+        if (status != null){
+            wrapper = wrapper.eq(RiskPlanUserBuilding::getStatus, status);
+        }
         return count(wrapper);
     }
 
@@ -65,7 +68,7 @@ public class RiskPlanUserBuildingServiceImpl
 
         //查看是否全部楼宇提交
         LambdaQueryWrapper<RiskPlanUserBuilding> wrapper2 = new LambdaQueryWrapper<>();
-        wrapper2 = wrapper2.eq(RiskPlanUserBuilding::getPlanId, planId).eq(RiskPlanUserBuilding::getBuildingId, buildingId);
+        wrapper2 = wrapper2.eq(RiskPlanUserBuilding::getPlanId, planId);
         List<RiskPlanUserBuilding> list = list(wrapper2);
         if (list.stream().allMatch(po -> po.getStatus().equals("finish"))) {
 
@@ -83,7 +86,7 @@ public class RiskPlanUserBuildingServiceImpl
             riskPlanTask1.setPlanId(lastRiskPlanTask.getPlanId());
             riskPlanTask1.setApprovalUserId(riskPlan.getLeaderUserId());
             riskPlanTask1.setTaskKey(RiskPlanStatusType.WAIT_LEADER_APPROVE.getStatus());
-            riskPlanTask1.setTaskName(RiskPlanStatusType.WAIT_LEADER_APPROVE.getStatus());
+            riskPlanTask1.setTaskName(RiskPlanStatusType.WAIT_LEADER_APPROVE.getTitle());
             riskPlanTask1.setStatus("running");
             riskPlanTask1.setStartTime(new Date());
             riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);

censoft-rongtong/src/main/resources/mapper/system/RiskPlanTaskMapper.xml

@@ -81,8 +81,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskName != null">task_name = #{taskName},</if>
             <if test="taskResult != null">task_result = #{taskResult},</if>
             <if test="taskOpinion != null">task_opinion = #{taskOpinion},</if>
-            <if test="approvalDeptId != null">approval_dept_id = #{approvalDeptId},</if>
-            <if test="approvalRoleKey != null">approval_role_key = #{approvalRoleKey},</if>
             <if test="status != null">status = #{status},</if>
             <if test="approvalUserId != null">approval_user_id = #{approvalUserId},</if>
             <if test="startTime != null">start_time = #{startTime},</if>