养护计划优化提交

王富生
1 parent da5f3ae0
Showing 25 changed files with 142 additions and 109 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitDetailRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanDetailController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainNotFinishPlanDetailRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitDetailPageRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDetailDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommitMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanDetailMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/FinishStateEnum.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
@@ -6,6 +6,7 @@ import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
 import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
 import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanPageReqVO;
 import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanRespVO;
 import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanSaveReqVO;
@@ -117,6 +118,9 @@ public class InspectionPlanController {
     @Operation(summary = "获得巡检计划汇总分页")
     @PreAuthorize("@ss.hasPermission('garden:inspection-plan:query')")
     public CommonResult<PageResult<InspectionPlanRespVO>> getInspectionPlanPage(@Valid InspectionPlanPageReqVO pageReqVO) {
+        if(pageReqVO.getCompanyId() == null){
+            pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId());
+        }
         PageResult<InspectionPlanRespVO> pageResult = inspectionPlanService.getInspectionPlanPage(pageReqVO);
         return success(pageResult);
     }
@@ -6,6 +6,7 @@ import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
 import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
 import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanPageReqVO;
 import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanRespVO;
 import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanSaveReqVO;
@@ -117,6 +118,9 @@ public class MaintainPlanController {
     @Operation(summary = "获得养护计划汇总分页")
     @PreAuthorize("@ss.hasPermission('garden:maintain-plan:query')")
     public CommonResult<PageResult<MaintainPlanRespVO>> getMaintainPlanPage(@Valid MaintainPlanPageReqVO pageReqVO) {
+        if(pageReqVO.getCompanyId() == null){
+            pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId());
+        }
         PageResult<MaintainPlanRespVO> pageResult = maintainPlanService.getMaintainPlanPage(pageReqVO);
         return success(pageResult);
     }
@@ -41,7 +41,7 @@ public class MaintainPlanCommitDetailRespVO {
     private String remark;
     @Schema(description = "总完成百分比", example = "98.00")
-    private Integer totalFinishPercent;
+    private Integer totalFinishNum;
     @Schema(description = "本次完成百分比", example = "98.00")
     @ExcelProperty("本次完成百分比")
@@ -45,8 +45,8 @@ public class MaintainPlanDetailPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDate[] endTime;
-    @Schema(description = "完成百分比")
-    private Integer finishPercent;
+    @Schema(description = "完成次数")
+    private Integer planFinishNum;
     @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成")
     private Integer finishState;
@@ -55,9 +55,9 @@ public class MaintainPlanDetailRespVO {
     @ExcelProperty("计划次数")
     private Integer planNum;
-    @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("完成百分比")
-    private Integer finishPercent;
+    @Schema(description = "完成次数", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("完成次数")
+    private Integer planFinishNum;
     @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("完成状态 1:未完成;2:进行中；3:已完成")
@@ -47,9 +47,9 @@ public class MaintainPlanDetailSaveReqVO {
     @Schema(description = "执行时间")
     private LocalDate endTime;
-    @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "完成百分比不能为空")
-    private Integer finishPercent;
+    @Schema(description = "完成地址", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "完成次数不能为空")
+    private Integer planFinishNum;
     @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "完成状态 1:未完成;2:进行中；3:已完成不能为空")
 package com.zteits.urbanops.module.garden.controller.admin.road;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -82,6 +83,9 @@ public class RoadController {
     @Operation(summary = "获得道路管理分页")
     @PreAuthorize("@ss.hasPermission('garden:road:query')")
     public CommonResult<PageResult<RoadRespVO>> getRoadPage(@Valid RoadPageReqVO pageReqVO) {
+        if(pageReqVO.getCompanyId() == null){
+            pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId());
+        }
         PageResult<RoadRespVO> pageResult = roadService.getRoadPage(pageReqVO);
         return success(pageResult);
     }
@@ -38,7 +38,7 @@ public class AppMaintainPlanDetailController {
     }
     @PostMapping("/get/not-finish")
-    @Operation(summary = "获取未养护计划明细")
+    @Operation(summary = "获取未完成养护计划明细")
     @Parameter(name = "plan_no", description = "计划编号", required = true, example = "1024")
     //@PreAuthorize("@ss.hasPermission('app:garden:maintain-plan-commit:query')")
     public CommonResult<List<AppMaintainNotFinishPlanDetailRespVO>> getMaintainNotFinishPlanCommitDetail(@Valid @RequestBody AppMaintainNotFinishPlanDetailReqVO reqVO) {
@@ -34,9 +34,9 @@ public class AppMaintainNotFinishPlanDetailRespVO {
     @ExcelProperty("周期ID: 1:日/次；2:周/次；3:月/次；4:年/次")
     private Integer cycleId;
-    @Schema(description = "本次完成百分比")
-    @ExcelProperty("本次完成百分比")
-    private Integer finishPercent;
+    @Schema(description = "完成次数")
+    @ExcelProperty("完成次数")
+    private Integer planFinishNum;
     @Schema(description = "提交人用户", example = "19167")
     @ExcelProperty("提交人用户")
@@ -35,6 +35,9 @@ public class AppMaintainPlanCommitDetailPageRespVO {
     @Schema(description = "计划次数")
     private Integer planNum;
+    @Schema(description = "完成计划次数")
+    private Integer planFinishNum;
+
     @Schema(description = "照片host")
     private String imgHost;
@@ -37,8 +37,8 @@ public class AppMaintainPlanDetailRespVO {
     @Schema(description = "计划次数")
     private Integer planNum;
-    @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Integer finishPercent;
+    @Schema(description = "完成次数", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Integer planFinishNum;
     @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成", requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer finishState;
@@ -23,6 +23,10 @@ public class AppMaintainPlanPagePlanTypeReqVO extends PageParam {
     @Schema(description = "计划名称", example = "王五")
     private String planName;
+    /**
+     * 完成状态 1:未完成;2:已完成;3:已失效
+     * @see com.zteits.urbanops.module.garden.enums.FinishStateEnum
+     */
     @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
     @NotNull(message = "完成状态不能为空")
     @Min(value = 1, message = "状态最小为1")
@@ -42,9 +42,9 @@ public class AppMaintainPlanPagePlanTypeRespVO {
     @ExcelProperty("计划次数")
     private Integer planNum;
-    @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("完成百分比")
-    private Integer finishPercent;
+    @Schema(description = "完成次数", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("完成次数")
+    private Integer planFinishNum;
     @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("完成状态 1:未完成;2:进行中；3:已完成")
@@ -19,6 +19,10 @@ public class AppMaintainPlanPageRoadReqVO extends PageParam {
     @Schema(description = "道路名称", example = "王五")
     private String roadName;
+    /**
+     * 完成状态 1:未完成;2:已完成;3:已失效
+     * @see com.zteits.urbanops.module.garden.enums.FinishStateEnum
+     */
     @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
     @NotNull(message = "完成状态不能为空")
     @Min(value = 1, message = "状态最小为1")
@@ -49,7 +49,6 @@ public class AppMaintainPlanPageRoadRespVO{
     @ExcelProperty("已完成次数")
     private Integer planFinishNum;
-
     @Schema(description = "执行开始时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDate beginTime;
@@ -71,9 +71,9 @@ public class MaintainPlanDetailDO extends BaseDO {
     private Integer planNum;
     /**
-     * 完成百分比
+     * 完成次数
      */
-    private Integer finishPercent;
+    private Integer planFinishNum;
     /**
      * 完成状态 1:未完成;2:已完成
      */
@@ -35,4 +35,11 @@ public interface MaintainPlanCommitMapper extends BaseMapperX&lt;MaintainPlanCommit
      * @return 分页结果
      */
     IPage<AppMaintainPlanCommitDetailPageRespVO> appMaintainPlanCommitDetailPage(@Param("page") IPage<AppMaintainPlanCommitDetailPageRespVO> page, @Param("req") AppMaintainPlanCommitPageReqVO pageReqVO);
+
+    /**
+     * 获取所有已完成比例
+     *
+     * @return
+     */
+    int selectFinishPercent(@Param("planNo") String planNo, @Param("sortNum") Integer sortNum);
 }
 \ No newline at end of file
@@ -35,7 +35,7 @@ public interface MaintainPlanDetailMapper extends BaseMapperX&lt;MaintainPlanDetail
                 .eqIfPresent(MaintainPlanDetailDO::getSortNum, reqVO.getSortNum())
                 .betweenIfPresent(MaintainPlanDetailDO::getBeginTime, reqVO.getBeginTime())
                 .betweenIfPresent(MaintainPlanDetailDO::getEndTime, reqVO.getEndTime())
-                .eqIfPresent(MaintainPlanDetailDO::getFinishPercent, reqVO.getFinishPercent())
+                .eqIfPresent(MaintainPlanDetailDO::getPlanFinishNum, reqVO.getPlanFinishNum())
                 .eqIfPresent(MaintainPlanDetailDO::getFinishState, reqVO.getFinishState())
                 .likeIfPresent(MaintainPlanDetailDO::getCreatorName, reqVO.getCreatorName())
                 .betweenIfPresent(MaintainPlanDetailDO::getCreateTime, reqVO.getCreateTime())
 package com.zteits.urbanops.module.garden.enums;
+import lombok.Getter;
+import lombok.Setter;
 public enum FinishStateEnum {
@@ -15,6 +17,12 @@ public enum FinishStateEnum {
      * 过期
      */
     EXPIRED(3),
+
+    /**
+     * 过期
+     */
+    STOP(4),
+
     ;
     FinishStateEnum(Integer status) {
@@ -4,6 +4,7 @@ import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
@@ -51,6 +52,7 @@ import java.util.stream.Collectors;
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*;
 import static com.zteits.urbanops.module.garden.enums.PlanConstants.CYCLE_ID_TYPE;
+import static javax.management.Query.eq;
 /**
  * 巡检计划汇总 Service 实现类
@@ -128,6 +130,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
         List<InspectionPlanDetailDO> detailDOList = new ArrayList<>();
         //按照道路创建计划
         createReqVO.getRoadListReqVO().forEach(roadReqVO -> {
+            ThreadUtil.sleep(1);
             InspectionPlanDO inspectionPlan = BeanUtils.toBean(createReqVO, InspectionPlanDO.class);
             String batchNo = "BN" + System.currentTimeMillis() + RandomUtil.randomInt(1000, 9999) + roadReqVO.getRoadId();
             inspectionPlan.setBatchNo(batchNo);
@@ -172,7 +175,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
             int index = 1;
             for (PeriodResult periodResult : calculate) {
                 InspectionPlanDetailDO entity = getInspectionPlanDetailDO(batchNo, createReqVO, roadReqVO, now);
-                ThreadUtil.sleep(2);
+                ThreadUtil.sleep(1);
                 entity.setSortNum(index);
                 entity.setPlanNum(periodResult.getCount());
                 entity.setBeginTime(LocalDateTime.parse(periodResult.getStart() + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -281,6 +284,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
     @Override
     public PageResult<InspectionPlanRespVO> getInspectionPlanPage(InspectionPlanPageReqVO pageReqVO) {
+
         PageResult<InspectionPlanDO> pageResult = inspectionPlanInterceptMapper.selectForPage(pageReqVO);
         PageResult<InspectionPlanRespVO> result = BeanUtils.toBean(pageResult, InspectionPlanRespVO.class);
@@ -341,9 +345,16 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
     @Override
     public void stopPlanInspectionPlan(String batchNo) {
-        inspectionPlanMapper.delete(InspectionPlanDO::getBatchNo, batchNo);
-        inspectionPlanDetailMapper.delete(InspectionPlanDetailDO::getBatchNo, batchNo);
-        inspectionPlanRoleMapper.delete(InspectionPlanRoleDO::getBatchNo, batchNo);
+        //停止计划详情
+        inspectionPlanDetailMapper.update(new UpdateWrapper<InspectionPlanDetailDO>().lambda()
+                .set(InspectionPlanDetailDO::getFinishState, FinishStateEnum.STOP.getStatus())
+                .eq(InspectionPlanDetailDO::getFinishState, FinishStateEnum.NOT_FINISHED.getStatus())
+                .eq(InspectionPlanDetailDO::getBatchNo, batchNo));
+        //停止计划
+        inspectionPlanMapper.update(new UpdateWrapper<InspectionPlanDO>().lambda()
+                .set(InspectionPlanDO::getFinishState, FinishStateEnum.STOP.getStatus())
+                .eq(InspectionPlanDO::getFinishState, FinishStateEnum.NOT_FINISHED.getStatus())
+                .eq(InspectionPlanDO::getBatchNo, batchNo));
     }
     @Override
@@ -418,8 +429,8 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
         LocalDate yesterday = LocalDate.now(); // 昨天日期
         LambdaUpdateWrapper<InspectionPlanDO> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.lt(InspectionPlanDO::getEndTime, yesterday)
-                .ne(InspectionPlanDO::getFinishState, FinishStateEnum.FINISHED.getStatus()) // 排除已完成的
-                .set(InspectionPlanDO::getFinishState, FinishStateEnum.EXPIRED.getStatus()); // 设置为过期状态
+                .set(InspectionPlanDO::getFinishState, FinishStateEnum.EXPIRED.getStatus()) // 设置为过期状态
+                .eq(InspectionPlanDO::getFinishState,  FinishStateEnum.NOT_FINISHED.getStatus());
         inspectionPlanMapper.update(null, updateWrapper);
     }
@@ -19,6 +19,7 @@ import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanComm
 import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanCommonUserMapper;
 import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanDetailMapper;
 import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanMapper;
+import com.zteits.urbanops.module.garden.enums.FinishStateEnum;
 import com.zteits.urbanops.module.system.api.dept.DeptApi;
 import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
 import jakarta.annotation.Resource;
@@ -93,20 +94,21 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
             throw exception(MAINTAIN_PLAN_NOT_EXISTS);
         }
-        /*3.查询计划明细最大次数*/
-        Long countNum = maintainPlanDetailMapper.selectCount(new QueryWrapper<MaintainPlanDetailDO>().lambda()
-                .eq(MaintainPlanDetailDO::getPlanNo, createReqVO.getPlanNo()));
+        int sortNum = maintainPlanDetailDO.getPlanFinishNum() +1;
+        /*3.查询已完成比例*/
+        int finishPercent = maintainPlanCommitMapper.selectFinishPercent(createReqVO.getPlanNo(), sortNum);
         MaintainPlanCommitDO commitDO = new MaintainPlanCommitDO();
         commitDO.setBatchNo(maintainPlanDO.getBatchNo());
         commitDO.setPlanNo(maintainPlanDetailDO.getPlanNo());
         commitDO.setBusiLine(maintainPlanDO.getBusiLine());
         commitDO.setPlanTypeId(maintainPlanDO.getPlanTypeId());
-        commitDO.setSortNum(countNum.intValue() +1);
+        //计划明细已完成次数+1
+        commitDO.setSortNum(sortNum);
         commitDO.setCompanyId(maintainPlanDO.getCompanyId());
         commitDO.setDeptId(maintainPlanDO.getDeptId());
         commitDO.setRoadId(maintainPlanDO.getRoadId());
-        commitDO.setFinishPercent(createReqVO.getTotalFinishPercent() - maintainPlanDetailDO.getFinishPercent());
+        commitDO.setFinishPercent(createReqVO.getTotalFinishPercent() - finishPercent);
         commitDO.setImgHost(createReqVO.getImgHost());
         commitDO.setBeginImg(JSONObject.toJSONString(createReqVO.getBeginImg()));
         commitDO.setProcessImg("[]");
@@ -142,25 +144,31 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
             }
         }
-        //完成状态 1:未完成;2:已完成
-        int detailFinishState = 1;
+
+        int detailFinishNum =  maintainPlanDetailDO.getPlanFinishNum();
         if(createReqVO.getTotalFinishPercent().equals(100)){
-            detailFinishState = 2;
+            detailFinishNum = detailFinishNum + 1;
         }
-        /*5.更新计划明细及计划汇总*/
-        LambdaUpdateWrapper<MaintainPlanDetailDO> detailUpdateSql = new LambdaUpdateWrapper<MaintainPlanDetailDO>()
-                .set(MaintainPlanDetailDO::getFinishPercent, createReqVO.getTotalFinishPercent())
-                .set(MaintainPlanDetailDO::getFinishState, detailFinishState)
-                .set(MaintainPlanDetailDO::getUpdateTime, LocalDateTime.now())
-                .eq(MaintainPlanDetailDO::getPlanNo, createReqVO.getPlanNo());
-        maintainPlanDetailMapper.update(detailUpdateSql);
+        //完成状态 1:未完成;2:已完成
+        int detailFinishState = FinishStateEnum.NOT_FINISHED.getStatus();
+        if(detailFinishNum == maintainPlanDetailDO.getPlanNum()){
+            detailFinishState = FinishStateEnum.FINISHED.getStatus();
+        }
         //完成状态 1:未完成;2:已完成
-        if(detailFinishState ==2){
-            int finishState =1;
+        if(detailFinishState == FinishStateEnum.FINISHED.getStatus()){
+            //更新明细
+            LambdaUpdateWrapper<MaintainPlanDetailDO> detailUpdateSql = new LambdaUpdateWrapper<MaintainPlanDetailDO>()
+                    .set(MaintainPlanDetailDO::getPlanFinishNum, detailFinishNum)
+                    .set(MaintainPlanDetailDO::getFinishState, detailFinishState)
+                    .set(MaintainPlanDetailDO::getUpdateTime, LocalDateTime.now())
+                    .eq(MaintainPlanDetailDO::getPlanNo, createReqVO.getPlanNo());
+            maintainPlanDetailMapper.update(detailUpdateSql);
+
+            int finishState = FinishStateEnum.NOT_FINISHED.getStatus();
             if(maintainPlanDO.getPlanNum().equals(maintainPlanDO.getPlanFinishNum()+1)){
-                finishState =2;
+                finishState = FinishStateEnum.FINISHED.getStatus();
             }
             LambdaUpdateWrapper<MaintainPlanDO> maintainPlanDOSql = new LambdaUpdateWrapper<MaintainPlanDO>()
                     .set(MaintainPlanDO::getPlanFinishNum, maintainPlanDO.getPlanFinishNum()+1)
@@ -234,12 +242,7 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
         }
         /*2.查询明细总完成次数*/
         MaintainPlanDetailDO maintainPlanDetailDO = maintainPlanDetailMapper.selectOne(MaintainPlanDetailDO::getPlanNo, planNo);
-        Integer totalFinishPercent;
-        if (maintainPlanDetailDO != null) {
-            totalFinishPercent = maintainPlanDetailDO.getFinishPercent();
-        } else {
-            totalFinishPercent = 0;
-        }
+
         /*1.查询共同处理人*/
         list.forEach(e -> {
             MaintainPlanCommitDetailRespVO respVO = new MaintainPlanCommitDetailRespVO();
@@ -247,7 +250,7 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
             respVO.setBeginImgList(StrUtils.imgProcess(e.getBeginImg(), ""));
             respVO.setProcessImgList(StrUtils.imgProcess(e.getProcessImg(), ""));
             respVO.setEndImgList(StrUtils.imgProcess(e.getEndImg(), ""));
-            respVO.setTotalFinishPercent(totalFinishPercent);
+            respVO.setTotalFinishNum(maintainPlanDetailDO.getPlanFinishNum());
             List<MaintainPlanCommonUserVO> commonUsers = new ArrayList<>();
             List<MaintainPlanCommonUserDO> maintainPlanCommonUserList = maintainPlanCommonUserMapper.selectList(new QueryWrapper<MaintainPlanCommonUserDO>().lambda()
                     .eq(MaintainPlanCommonUserDO::getParentId, maintainPlanDetailDO.getId())
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
 import com.zteits.urbanops.framework.dict.core.DictFrameworkUtils;
@@ -140,6 +141,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
         List<MaintainPlanDetailDO> detailDOList = new ArrayList<>();
         //按照道路创建计划
         createReqVO.getRoadListReqVO().forEach(roadReqVO -> {
+            ThreadUtil.sleep(1);
             MaintainPlanDO maintainPlan = BeanUtils.toBean(createReqVO, MaintainPlanDO.class);
             String batchNo = "BN" + System.currentTimeMillis() + RandomUtil.randomInt(1000, 9999) + roadReqVO.getRoadId();
             maintainPlan.setBatchNo(batchNo);
@@ -185,7 +187,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
             int index = 1;
             for (PeriodResult periodResult : calculate) {
                 MaintainPlanDetailDO entity = getMaintainPlanDetailDO(batchNo, createReqVO, roadReqVO, now);
-                ThreadUtil.sleep(2);
+                ThreadUtil.sleep(1);
                 entity.setSortNum(index);
                 entity.setPlanNum(periodResult.getCount());
                 entity.setBeginTime(LocalDateTime.parse(periodResult.getStart() + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -354,9 +356,18 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
     @Override
     public void stopPlanInspectionPlan(String batchNo) {
-        maintainPlanMapper.delete(MaintainPlanDO::getBatchNo, batchNo);
-        maintainPlanDetailMapper.delete(MaintainPlanDetailDO::getBatchNo, batchNo);
-        maintainPlanRoleMapper.delete(MaintainPlanRoleDO::getBatchNo, batchNo);
+        //停止计划详情
+        maintainPlanDetailMapper.update(new UpdateWrapper<MaintainPlanDetailDO>().lambda()
+                .set(MaintainPlanDetailDO::getFinishState, FinishStateEnum.STOP.getStatus())
+                .eq(MaintainPlanDetailDO::getFinishState, FinishStateEnum.NOT_FINISHED.getStatus())
+                .eq(MaintainPlanDetailDO::getBatchNo, batchNo));
+        //停止计划
+        maintainPlanMapper.update(new UpdateWrapper<MaintainPlanDO>().lambda()
+                .set(MaintainPlanDO::getFinishState, FinishStateEnum.STOP.getStatus())
+                .eq(MaintainPlanDO::getFinishState, FinishStateEnum.NOT_FINISHED.getStatus())
+                .eq(MaintainPlanDO::getBatchNo, batchNo));
+
+
     }
     @Override
@@ -406,7 +417,6 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
     @Override
     public PageResult<AppMaintainPlanPagePlanTypeRespVO> appMaintainPlanPlanTypePage(AppMaintainPlanPagePlanTypeReqVO pageReqVO) {
         String busiLine = SecurityFrameworkUtils.getBusiLine();
-        Long companyId = SecurityFrameworkUtils.getCompanyId();
         if (StringUtils.isNotEmpty(busiLine)) {
             pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(",")));
         }
@@ -27,7 +27,7 @@
             a.end_time,
             a.company_id,
             a.dept_id,
-            a.finish_percent as finishPercent,
+            a.finish_num,
             c.finish_time,
             c.user_name
         FROM
@@ -95,16 +95,16 @@
        b.plan_attr,
        b.plan_type_id,
        b.cycle_id,
-       b.plan_num,
+       a.plan_num,
        b.busi_line,
-       b.plan_finish_num,
+       a.plan_finish_num,
        b.rate,
        a.begin_time,
        a.end_time,
        a.company_id,
        a.finish_state,
        a.dept_id,
-       a.finish_percent,
+       c.finish_percent,
        c.begin_img,
        c.img_host,
        c.finish_time,
@@ -120,4 +120,14 @@
        AND a.plan_no = c.plan_no
        AND c.plan_no = #{req.planNo}
    </select>
+
+    <select id="selectFinishPercent" resultType="java.lang.Integer">
+        SELECT
+         sum(a.finish_percent) as finishPercent,
+        FROM
+        garden_maintain_plan_commit a
+        WHERE
+        a.plan_no = #{planNo}
+        AND a.sort_num = #{sortNum}
+    </select>
 </mapper>
@@ -22,7 +22,7 @@
         a.rate,
         a.cycle_id,
         c.plan_num,
-        c.finish_percent,
+        c.plan_finish_num,
         c.finish_state,
         c.begin_time,
         c.end_time,
@@ -33,6 +33,8 @@
         WHERE a.batch_no=c.batch_no
         AND a.deleted=0
         AND a.road_id = #{req.roadId}
+        <!--状态 1:未完成;2:已完成;3:已失效-->
+        AND a.finish_state = #{req.finishState}
         <if test="req.planName != null and req.planName !=''">
             AND a.plan_name LIKE CONCAT('%',#{req.planName},'%')
         </if>
@@ -48,20 +50,6 @@
                 #{batchNo}
             </foreach>
         </if>
-        <!--状态 1:未完成;2:已完成;3:已失效-->
-        <if test="req.finishState == 3">
-            and a.finish_state = #{req.finishState}
-            <![CDATA[and c.end_time < #{req.localDateTime}]]>
-        </if>
-        <if test="req.finishState == 2">
-            and c.finish_state = #{req.finishState}
-        </if>
-        <if test="req.finishState == 1">
-            and c.finish_state = #{req.finishState}
-            <![CDATA[and c.end_time >= #{req.localDateTime}]]>
-            <![CDATA[and c.begin_time <= #{req.localDateTime}]]>
-
-        </if>
     </select>
     <select id="getMaintainNotFinishPlanCommitDetail" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailRespVO">
@@ -73,7 +61,7 @@
         a.rate,
         a.cycle_id,
         c.plan_num,
-        c.finish_percent,
+        c.plan_finish_num,
         c.finish_state,
         c.begin_time,
         c.end_time,
@@ -27,10 +27,10 @@
         FROM
         garden_maintain_plan a
         JOIN -- 建议用显式JOIN代替隐式连接，可读性更高
-        garden_maintain_plan_detail b ON
-        a.batch_no = b.batch_no
+        garden_maintain_plan_detail b ON a.batch_no = b.batch_no
         AND a.deleted = b.deleted
         WHERE a.deleted = 0
+        and b.finish_state = #{req.finishState}
          <if test="req.roadName != null and req.roadName !=''">
             AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
         </if>
@@ -46,20 +46,6 @@
                 #{busiLine}
             </foreach>
         </if>
-        <!--状态 1:未完成;2:已完成;3:已失效-->
-        <if test="req.finishState == 3">
-            and b.finish_state = #{req.finishState}
-            <![CDATA[and a.end_time < #{req.localDate}]]>
-        </if>
-        <if test="req.finishState == 2">
-            and b.finish_state = #{req.finishState}
-        </if>
-        <if test="req.finishState == 1">
-            and b.finish_state = #{req.finishState}
-            <![CDATA[and a.end_time >= #{req.localDate}]]>
-            <![CDATA[and b.end_time >= #{req.localDate}]]>
-            <![CDATA[and b.begin_time <= #{req.localDate}]]>
-        </if>
     </select>
     <select id="appMaintainPlanPlanTypePage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO">
@@ -71,7 +57,7 @@
             a.rate,
             a.cycle_id,
             c.plan_num,
-            c.finish_percent,
+            c.plan_finish_num,
             c.finish_state,
             c.begin_time,
             c.end_time
@@ -83,6 +69,8 @@
         AND a.deleted=c.deleted
           AND a.deleted=0
           AND a.plan_type_id = #{req.planTypeId}
+        <!--状态 1:未完成;2:已完成;3:已失效-->
+         AND c.finish_state = #{req.finishState}
         <if test="req.planName != null and req.planName !=''">
             AND a.plan_type_id LIKE CONCAT('%',#{req.planName},'%')
         </if>
@@ -98,20 +86,6 @@
                 #{busiLine}
             </foreach>
         </if>
-        <!--状态 1:未完成;2:已完成;3:已失效-->
-        <if test="req.finishState == 3">
-            and c.finish_state = #{req.finishState}
-            <![CDATA[and c.end_time < #{req.localDateTime}]]>
-        </if>
-        <if test="req.finishState == 2">
-            and c.finish_state = #{req.finishState}
-        </if>
-        <if test="req.finishState == 1">
-            and c.finish_state = #{req.finishState}
-            <![CDATA[and c.end_time >= #{req.localDateTime}]]>
-            <![CDATA[and c.begin_time <= #{req.localDateTime}]]>
-
-        </if>
     </select>
 </mapper>