Commit 799a221f8fd3e2d700d7ff2320f463f83bafcd23

Authored by 王富生
1 parent e6efdba3

优化

urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java
@@ -23,6 +23,7 @@ import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlan @@ -23,6 +23,7 @@ import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlan
23 import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanDetailMapper; 23 import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanDetailMapper;
24 import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanMapper; 24 import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanMapper;
25 import com.zteits.urbanops.module.garden.dal.mysql.road.RoadMapper; 25 import com.zteits.urbanops.module.garden.dal.mysql.road.RoadMapper;
  26 +import com.zteits.urbanops.module.garden.enums.FinishStateEnum;
26 import com.zteits.urbanops.module.system.api.dept.DeptApi; 27 import com.zteits.urbanops.module.system.api.dept.DeptApi;
27 import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO; 28 import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
28 import com.zteits.urbanops.module.system.api.permission.RoleApi; 29 import com.zteits.urbanops.module.system.api.permission.RoleApi;
@@ -110,9 +111,9 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ @@ -110,9 +111,9 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
110 inspectionPlanCommitMapper.insert(inspectionPlanCommit); 111 inspectionPlanCommitMapper.insert(inspectionPlanCommit);
111 112
112 Integer detailFinishNum = inspectionPlanDetailDO.getPlanFinishNum() + 1; 113 Integer detailFinishNum = inspectionPlanDetailDO.getPlanFinishNum() + 1;
113 - int detailFinishState = 1; 114 + int detailFinishState = FinishStateEnum.NOT_FINISHED.getStatus();
114 if(detailFinishNum.equals(inspectionPlanDetailDO.getPlanNum())){ 115 if(detailFinishNum.equals(inspectionPlanDetailDO.getPlanNum())){
115 - detailFinishState = 2; 116 + detailFinishState = FinishStateEnum.FINISHED.getStatus();
116 } 117 }
117 LambdaUpdateWrapper<InspectionPlanDetailDO> detailUpdateSql = new LambdaUpdateWrapper<InspectionPlanDetailDO>() 118 LambdaUpdateWrapper<InspectionPlanDetailDO> detailUpdateSql = new LambdaUpdateWrapper<InspectionPlanDetailDO>()
118 .set(InspectionPlanDetailDO::getPlanFinishNum, detailFinishNum) 119 .set(InspectionPlanDetailDO::getPlanFinishNum, detailFinishNum)
@@ -122,9 +123,9 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ @@ -122,9 +123,9 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
122 inspectionPlanDetailMapper.update(detailUpdateSql); 123 inspectionPlanDetailMapper.update(detailUpdateSql);
123 124
124 Integer planFinishNum = inspectionPlanDO.getPlanFinishNum() + 1; 125 Integer planFinishNum = inspectionPlanDO.getPlanFinishNum() + 1;
125 - int planFinishState = 1; 126 + int planFinishState = FinishStateEnum.NOT_FINISHED.getStatus();
126 if(planFinishNum.equals(inspectionPlanDO.getPlanNum())){ 127 if(planFinishNum.equals(inspectionPlanDO.getPlanNum())){
127 - planFinishState = 2; 128 + planFinishState = FinishStateEnum.FINISHED.getStatus();
128 } 129 }
129 LambdaUpdateWrapper<InspectionPlanDO> updateSql = new LambdaUpdateWrapper<InspectionPlanDO>() 130 LambdaUpdateWrapper<InspectionPlanDO> updateSql = new LambdaUpdateWrapper<InspectionPlanDO>()
130 .set(InspectionPlanDO::getPlanFinishNum, planFinishNum) 131 .set(InspectionPlanDO::getPlanFinishNum, planFinishNum)