app养护计划明细提交

王富生
1 parent cfa1dff1
Showing 24 changed files with 521 additions and 177 deletions
urbanops-framework/urbanops-spring-boot-starter-security/src/main/java/com/zteits/urbanops/framework/security/core/util/SecurityFrameworkUtils.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanCommitController.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/AppMaintainNotFinishPlanDetailReqVO.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/AppMaintainPlanCommitPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.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/AppMaintainPlanPageRoadReqVO.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/service/inspectionplan/InspectionPlanDetailServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitService.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailService.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
@@ -136,6 +136,17 @@ public class SecurityFrameworkUtils {
     }
     /**
+     * 获得当前用户的业务线，从上下文中
+     *
+     * @return 部门编号
+     */
+    @Nullable
+    public static Long getDeptId() {
+        LoginUser loginUser = getLoginUser();
+        return loginUser != null ? MapUtil.getLong(loginUser.getInfo(), LoginUser.INFO_KEY_DEPT_ID) : null;
+    }
+
+    /**
      * 设置当前用户
      *
      * @param loginUser 登录用户
@@ -84,14 +84,6 @@ public class MaintainPlanCommitRespVO {
     @ExcelProperty("提交人用户ID")
     private String userName;
-    @Schema(description = "角色ID", example = "你猜")
-    @ExcelProperty("角色ID")
-    private Long roleId;
-
-    @Schema(description = "角色", example = "你猜")
-    @ExcelProperty("角色")
-    private String roleName;
-
     @Schema(description = "备注", example = "你猜")
     @ExcelProperty("备注")
     private String remark;
@@ -30,10 +30,6 @@ public class AppInspectionPlanDetailReqVO {
     @Hidden
     private Long companyId;
-    @Schema(description = "角色IDS")
-    @Hidden
-    private List<Long> roleIds;
-
     @Schema(description = "业务线")
     @Hidden
     private List<String> busiLineList;
 package com.zteits.urbanops.module.garden.controller.app.maintainplan;
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
-import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanCommitDetailRespVO;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitDetailPageRespVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitPageReqVO;
 import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitSaveReqVO;
 import com.zteits.urbanops.module.garden.service.maintainplan.MaintainPlanCommitService;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
@@ -33,12 +34,11 @@ public class AppMaintainPlanCommitController {
         return success(maintainPlanCommitService.appCreateMaintainPlanCommit(createReqVO));
     }
-    @GetMapping("/get/plan-no")
+    @PostMapping("/page")
     @Operation(summary = "获取养护计划-共同处理人明细")
-    @Parameter(name = "plan_no", description = "计划编号", required = true, example = "1024")
     //@PreAuthorize("@ss.hasPermission('app:garden:maintain-plan-commit:query')")
-    public CommonResult<List<MaintainPlanCommitDetailRespVO>> getMaintainPlanCommitDetailByPlanNo(@RequestParam("plan_no") @NotBlank String planNo) {
-        return success( maintainPlanCommitService.getMaintainPlanCommitDetailByPlanNo(planNo));
+    public CommonResult<PageResult<AppMaintainPlanCommitDetailPageRespVO>> appMaintainPlanCommitDetailPage(@Valid @RequestBody AppMaintainPlanCommitPageReqVO pageReqVO) {
+        return success(maintainPlanCommitService.appMaintainPlanCommitDetailPage(pageReqVO));
     }
 }
 \ No newline at end of file
 package com.zteits.urbanops.module.garden.controller.app.maintainplan;
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailReqVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailRespVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanDetailListByRoadPageReqVO;
 import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanDetailRespVO;
 import com.zteits.urbanops.module.garden.service.maintainplan.MaintainPlanDetailService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
-import jakarta.validation.constraints.NotNull;
+import jakarta.validation.Valid;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import java.util.List;
@@ -30,17 +31,17 @@ public class AppMaintainPlanDetailController {
     @GetMapping("/get/details-road")
     @Operation(summary = "app-获得养护计划明细")
-    @Parameter(name = "road_id", description = "道路ID", required = true, example = "1024")
-    @Parameter(name = "finish_state", description = "完成状态 1:未完成;2:已完成;3:已失效", required = true, example = "1024")
-    @Parameter(name = "plan_name", description = "计划名称", required = true, example = "1024")
-   // @PreAuthorize("@ss.hasPermission('app:garden:maintain-plan-detail:road:query')")
-    public CommonResult<List<AppMaintainPlanDetailRespVO>> appMaintainPlanDetailListByRoad(@RequestParam("road_id") @NotNull Long roadId,
-                                                                                           @RequestParam("finish_state") Integer finishState,
-                                                                                           @RequestParam("plan_name") String planName) {
-        List<AppMaintainPlanDetailRespVO> list = maintainPlanDetailService.appMaintainPlanDetailListByRoad(roadId, finishState, planName);
-        return success(list);
+    // @PreAuthorize("@ss.hasPermission('app:garden:maintain-plan-detail:road:query')")
+    public CommonResult<PageResult<AppMaintainPlanDetailRespVO>> appMaintainPlanDetailListByRoad(@Valid AppMaintainPlanDetailListByRoadPageReqVO pageReqVO) {
+        PageResult<AppMaintainPlanDetailRespVO> pageResult = maintainPlanDetailService.appMaintainPlanDetailListByRoadPage(pageReqVO);
+        return success(pageResult);
     }
-
-
+    @PostMapping("/get/not-finish")
+    @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) {
+        return success( maintainPlanDetailService.getMaintainNotFinishPlanCommitDetail(reqVO));
+    }
 }
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo;
+
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 未完成养护计划明细 Request VO")
+@Data
+public class AppMaintainNotFinishPlanDetailReqVO {
+
+    @Schema(description = "计划编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "计划编码不能为空")
+    private String planNo;
+
+    @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "24742")
+    @NotNull(message = "养护类型不能为空")
+    private Integer planTypeId;
+
+    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
+    @Hidden
+    private Integer finishState;
+}
+package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "管理后台 - 未完成养护计划明细 Request VO")
+@Data
+public class AppMaintainNotFinishPlanDetailRespVO {
+    @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
+    private String batchNo;
+
+    @Schema(description = "计划编码", example = "王五")
+    private String planNo;
+
+    @Schema(description = "计划名称", example = "王五")
+    private String planName;
+
+    @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "24742")
+    @NotNull(message = "养护类型不能为空")
+    private Integer planTypeId;
+
+    @Schema(description = "次数 如：1/3等", requiredMode = Schema.RequiredMode.REQUIRED, example = "1/3")
+    @ExcelProperty("次数 如：1/3等")
+    private String rate;
+
+    @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "6415")
+    @ExcelProperty("周期ID: 1:日/次；2:周/次；3:月/次；4:年/次")
+    private Integer cycleId;
+
+    @Schema(description = "本次完成百分比")
+    @ExcelProperty("本次完成百分比")
+    private Integer finishPercent;
+
+    @Schema(description = "提交人用户", example = "19167")
+    @ExcelProperty("提交人用户")
+    private Long userId;
+
+    @Schema(description = "提交人用户ID", example = "王五")
+    @ExcelProperty("提交人用户ID")
+    private String userName;
+
+    @Schema(description = "备注", example = "你猜")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "完成时间")
+    @ExcelProperty("完成时间")
+    private LocalDateTime finishTime;
+
+    @Schema(description = "执行开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime beginTime;
+
+    @Schema(description = "执行时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime endTime;
+
+}
+package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "管理后台 - 养护计划 Response VO")
+@Data
+public class AppMaintainPlanCommitDetailPageRespVO {
+
+    @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String batchNo;
+
+    @Schema(description = "计划编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String planNo;
+
+    @Schema(description = "计划名称", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String planName;
+
+    @Schema(description = "排序号:第n次计划", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Integer sortNum;
+
+    @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "24742")
+    private Integer planTypeId;
+
+    @Schema(description = "次数 如：1/3等", requiredMode = Schema.RequiredMode.REQUIRED, example = "1/3")
+    private String rate;
+
+    @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "6415")
+    private Integer cycleId;
+
+    @Schema(description = "计划次数")
+    private Integer planNum;
+
+    @Schema(description = "照片host")
+    private String imgHost;
+
+    @Schema(description = "开始照片")
+    private String beginImg;
+
+    @Schema(description = "开始照片")
+    private List<String> beginImgList;
+
+    /**
+     * 养护面积:单位m²
+     */
+    private Double opArea;
+    /**
+     * 操作时长
+     */
+    private Double opTime;
+
+    @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Integer finishPercent;
+
+    @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Integer finishState;
+
+    @Schema(description = "执行开始时间")
+    private LocalDateTime beginTime;
+
+    @Schema(description = "执行时间")
+    private LocalDateTime endTime;
+
+}
+package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo;
+
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 未完成养护计划明细 Request VO")
+@Data
+public class AppMaintainPlanCommitPageReqVO extends PageParam {
+
+    @Schema(description = "计划编码")
+    @NotBlank(message = "计划编码不能为空")
+    private String planNo;
+
+}
+package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo;
+
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Set;
+
+@Schema(description = "管理后台 - 养护计划汇总分页 Request VO")
+@Data
+public class AppMaintainPlanDetailListByRoadPageReqVO extends PageParam {
+
+
+    @Schema(description = "道路名称")
+    @NotNull
+    private Long roadId;
+
+    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
+    @NotNull(message = "完成状态不能为空")
+    @Min(value = 1, message = "状态最小为1")
+    @Max(value = 3, message = "状态不能大于4")
+    private Integer finishState;
+
+    @Schema(description = "计划名称")
+    private String planName;
+
+    @Schema(description = "计划批次号列表")
+    @Hidden
+    private Set<String> batchNos;
+
+    @Schema(description = "业务线")
+    @Hidden
+    private List<String> busiLineList;
+
+    @Schema(description = "系统时间")
+    @Hidden
+    private LocalDate localDate;
+}
@@ -10,6 +10,7 @@ import lombok.Data;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Set;
 @Schema(description = "管理后台 - 养护计划汇总分页 Request VO")
 @Data
@@ -28,13 +29,10 @@ public class AppMaintainPlanPagePlanTypeReqVO extends PageParam {
     @Max(value = 3, message = "状态不能大于4")
     private Integer finishState;
-    @Schema(description = "公司ID")
-    @Hidden
-    private Long companyId;
-    @Schema(description = "角色IDS")
+    @Schema(description = "计划批次号列表")
     @Hidden
-    private List<Long> roleIds;
+    private Set<String> batchNos;
     @Schema(description = "业务线")
     @Hidden
@@ -7,12 +7,10 @@ import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDate;
 import java.util.List;
-
-import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.util.Set;
 @Schema(description = "管理后台 - 养护计划汇总分页 Request VO")
 @Data
@@ -27,13 +25,10 @@ public class AppMaintainPlanPageRoadReqVO extends PageParam {
     @Max(value = 3, message = "状态不能大于4")
     private Integer finishState;
-    @Schema(description = "公司ID")
-    @Hidden
-    private Long companyId;
-    @Schema(description = "角色IDS")
+    @Schema(description = "批次号")
     @Hidden
-    private List<Long> roleIds;
+    private Set<String> batchNos;
     @Schema(description = "业务线")
     @Hidden
@@ -3,9 +3,12 @@ package com.zteits.urbanops.module.garden.dal.mysql.maintainplan;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
+import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanCommitPageReqVO;
+import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanCommitRespVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitDetailPageRespVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitPageReqVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanCommitDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
@@ -25,5 +28,11 @@ public interface MaintainPlanCommitMapper extends BaseMapperX&lt;MaintainPlanCommit
      */
     IPage<MaintainPlanCommitRespVO> selectForPage(@Param("page") IPage<MaintainPlanCommitRespVO> page, @Param("req") MaintainPlanCommitPageReqVO req, @Param("busiLineList") List<String> busiLineList);
-
+    /**
+     * 查询已完成明细
+     *
+     * @param pageReqVO 分页参数
+     * @return 分页结果
+     */
+    IPage<AppMaintainPlanCommitDetailPageRespVO> appMaintainPlanCommitDetailPage(@Param("page") IPage<AppMaintainPlanCommitDetailPageRespVO> page, @Param("req") AppMaintainPlanCommitPageReqVO pageReqVO);
 }
 \ No newline at end of file
 package com.zteits.urbanops.module.garden.dal.mysql.maintainplan;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
-import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
-import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanDetailPageReqVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailReqVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailRespVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanDetailListByRoadPageReqVO;
 import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanDetailRespVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDetailDO;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
-import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*;
 import org.apache.ibatis.annotations.Param;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 /**
@@ -46,16 +45,19 @@ public interface MaintainPlanDetailMapper extends BaseMapperX&lt;MaintainPlanDetail
     int deleteByBatchNo(@Param("batchNo") String batchNo);
     /**
-     * app-查询指定业务线的指定道路的养护计划
-     * @param busiLineList
-     * @param roadId
-     * @param companyId
-     * @param roleIds
-     * @param now
-     * @return
+     * app-按养护类型获取巡检计划列表-app
+     *
+     * @param page
+     * @param req
+     * @return 列表
      */
-    List<AppMaintainPlanDetailRespVO> appMaintainPlanDetailListByRoad(@Param("busiLineList") List<String> busiLineList, @Param("roadId") Long roadId, @Param("companyId") Long companyId,
-                                                                      @Param("roleIds") List<Long> roleIds,  @Param("localDate") LocalDate now, @Param("finishState") Integer finishState, @Param("planName") String planName);
+    IPage<AppMaintainPlanDetailRespVO> appMaintainPlanDetailListByRoadPage(@Param("page") IPage<AppMaintainPlanDetailRespVO> page, @Param("req") AppMaintainPlanDetailListByRoadPageReqVO req);
+    /**
+     * app-获取未完成养护计划列表-app
+     * @param reqVO 入参数
+     * @return 列表
+     */
+    List<AppMaintainNotFinishPlanDetailRespVO> getMaintainNotFinishPlanCommitDetail(AppMaintainNotFinishPlanDetailReqVO reqVO);
 }
 \ No newline at end of file
 package com.zteits.urbanops.module.garden.service.inspectionplan;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.common.util.object.BeanUtils;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanDetailPageReqVO;
+import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanDetailSaveReqVO;
 import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanDetailReqVO;
 import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanDetailRespVO;
+import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDetailDO;
+import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanDetailMapper;
+import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanRoleMapper;
 import com.zteits.urbanops.module.system.api.permission.RoleApi;
+import jakarta.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.*;
-import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*;
-import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDetailDO;
-import com.zteits.urbanops.framework.common.pojo.PageResult;
-import com.zteits.urbanops.framework.common.util.object.BeanUtils;
-
-import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanDetailMapper;
-
-import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList;
+import java.util.Arrays;
+import java.util.List;
 /**
  * 巡检计划 Service 实现类
@@ -35,6 +33,9 @@ public class InspectionPlanDetailServiceImpl implements InspectionPlanDetailServ
     private InspectionPlanDetailMapper inspectionPlanDetailMapper;
     @Resource
+    private InspectionPlanRoleMapper inspectionPlanRoleMapper;
+
+    @Resource
     private RoleApi roleApi;
     @Override
@@ -91,16 +92,15 @@ public class InspectionPlanDetailServiceImpl implements InspectionPlanDetailServ
     public List<AppInspectionPlanDetailRespVO> getInspectionPlanDetailForApp(AppInspectionPlanDetailReqVO pageReqVO) {
         String busiLine = SecurityFrameworkUtils.getBusiLine();
         Long companyId = SecurityFrameworkUtils.getCompanyId();
+        Long deptId = SecurityFrameworkUtils.getDeptId();
         if (StringUtils.isNotEmpty(busiLine)) {
             pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(",")));
         }
         pageReqVO.setCompanyId(companyId);
-        /*1.查询登录用户角色*/
-        List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
-        pageReqVO.setRoleIds(roleIds);
         pageReqVO.setLocalDateTime(LocalDateTime.now());
-        /*2.明细*/
+
+         /*2.明细*/
        return inspectionPlanDetailMapper.getInspectionPlanDetailForApp(pageReqVO);
     }
@@ -2,6 +2,8 @@ package com.zteits.urbanops.module.garden.service.maintainplan;
 import java.util.*;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitDetailPageRespVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitPageReqVO;
 import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitSaveReqVO;
 import jakarta.validation.*;
 import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*;
@@ -78,4 +80,13 @@ public interface MaintainPlanCommitService {
      */
     PageResult<MaintainPlanCommitRespVO> getMaintainPlanCommitPage(MaintainPlanCommitPageReqVO pageReqVO);
+    /**
+     * app-获得养护计划明细分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 养护计划明细分页
+     */
+    PageResult<AppMaintainPlanCommitDetailPageRespVO> appMaintainPlanCommitDetailPage(AppMaintainPlanCommitPageReqVO pageReqVO);
+
+
 }
 \ No newline at end of file
@@ -10,7 +10,7 @@ import com.zteits.urbanops.framework.common.util.string.StrUtils;
 import com.zteits.urbanops.framework.mybatis.core.util.MyBatisUtils;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
 import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*;
-import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitSaveReqVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.*;
 import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanCommitDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanCommonUserDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDO;
@@ -210,6 +210,20 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
     }
     @Override
+    public PageResult<AppMaintainPlanCommitDetailPageRespVO> appMaintainPlanCommitDetailPage(AppMaintainPlanCommitPageReqVO pageReqVO) {
+        //分页
+        IPage<AppMaintainPlanCommitDetailPageRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
+        IPage<AppMaintainPlanCommitDetailPageRespVO> page = maintainPlanCommitMapper.appMaintainPlanCommitDetailPage(mpPage, pageReqVO);
+
+        page.getRecords().forEach(respVO -> {
+            respVO.setBeginImgList(StrUtils.imgProcess(respVO.getBeginImg(), ""));
+        });
+
+        // 转换返回
+        return new PageResult<>(page.getRecords(), page.getTotal());
+    }
+
+    @Override
     public List<MaintainPlanCommitDetailRespVO> getMaintainPlanCommitDetailByPlanNo(String planNo) {
         List<MaintainPlanCommitDetailRespVO> respList = new ArrayList<>();
         /*1.查询处理明细*/
@@ -270,7 +284,6 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
         // 转换返回
         return new PageResult<>(page.getRecords(), page.getTotal());
     }
-
     /**
      * 回填部门/公司/角色
      * @param list 分页对象
@@ -2,6 +2,9 @@ package com.zteits.urbanops.module.garden.service.maintainplan;
 import java.util.*;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailReqVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailRespVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanDetailListByRoadPageReqVO;
 import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanDetailRespVO;
 import jakarta.validation.*;
 import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*;
@@ -62,9 +65,16 @@ public interface MaintainPlanDetailService {
     /**
      * 按照道路查询养护计划列表
-     * @param roadId 道路ID
+     * @param pageReqVO 道路ID
      * @return
      */
-    List<AppMaintainPlanDetailRespVO> appMaintainPlanDetailListByRoad(Long roadId, Integer finishState, String planName);
+    PageResult<AppMaintainPlanDetailRespVO> appMaintainPlanDetailListByRoadPage(AppMaintainPlanDetailListByRoadPageReqVO pageReqVO);
+
+    /**
+     * 获得未完成养护计划明细列表
+     * @param reqVO
+     * @return
+     */
+    List<AppMaintainNotFinishPlanDetailRespVO> getMaintainNotFinishPlanCommitDetail(AppMaintainNotFinishPlanDetailReqVO reqVO);
 }
 \ No newline at end of file
 package com.zteits.urbanops.module.garden.service.maintainplan;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import com.zteits.urbanops.framework.mybatis.core.util.MyBatisUtils;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanDetailPageReqVO;
+import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanDetailSaveReqVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailReqVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailRespVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanDetailListByRoadPageReqVO;
 import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanDetailRespVO;
+import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDetailDO;
+import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanRoleDO;
+import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanDetailMapper;
+import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanRoleMapper;
 import com.zteits.urbanops.module.system.api.permission.RoleApi;
+import jakarta.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import java.time.LocalDate;
-import java.util.*;
-import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*;
-import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDetailDO;
-import com.zteits.urbanops.framework.common.pojo.PageResult;
-import com.zteits.urbanops.framework.common.util.object.BeanUtils;
-
-import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanDetailMapper;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 /**
@@ -31,6 +44,9 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService 
     private MaintainPlanDetailMapper maintainPlanDetailMapper;
     @Resource
+    private MaintainPlanRoleMapper maintainPlanRoleMapper;
+
+    @Resource
     private RoleApi roleApi;
     @Override
@@ -84,18 +100,48 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService 
     }
     @Override
-    public List<AppMaintainPlanDetailRespVO> appMaintainPlanDetailListByRoad(Long roadId, Integer finishState, String planName) {
+    public PageResult<AppMaintainPlanDetailRespVO> appMaintainPlanDetailListByRoadPage(AppMaintainPlanDetailListByRoadPageReqVO pageReqVO) {
         String busiLine = SecurityFrameworkUtils.getBusiLine();
-        Long companyId = SecurityFrameworkUtils.getCompanyId();
-        List<String> busiLineList = new ArrayList<>();
         if (StringUtils.isNotEmpty(busiLine)) {
-            busiLineList = Arrays.asList(busiLine.split(","));
+            pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(",")));
         }
         /*1.查询登录用户角色*/
+        Set<String> batchNos = this.getBatchNosByLoginUserId();
+        pageReqVO.setLocalDate(LocalDate.now());
+        pageReqVO.setBatchNos(batchNos);
+        /*2.分页*/
+        IPage<AppMaintainPlanDetailRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
+        IPage<AppMaintainPlanDetailRespVO> page = maintainPlanDetailMapper.appMaintainPlanDetailListByRoadPage(mpPage, pageReqVO);
+        // 转换返回
+        return new PageResult<>(page.getRecords(), page.getTotal());
+    }
+
+    @Override
+    public List<AppMaintainNotFinishPlanDetailRespVO> getMaintainNotFinishPlanCommitDetail(AppMaintainNotFinishPlanDetailReqVO reqVO) {
+        //完成状态 1:未完成;2:已完成;3:已失效
+        reqVO.setFinishState(1);
+        return maintainPlanDetailMapper.getMaintainNotFinishPlanCommitDetail(reqVO);
+    }
+
+    /**
+     * 获取登录用户批次号List
+     */
+    private Set<String> getBatchNosByLoginUserId() {
+        Long companyId = SecurityFrameworkUtils.getCompanyId();
+        Long deptId = SecurityFrameworkUtils.getDeptId();
+        /*1.查询登录用户角色*/
         List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
-        LocalDate now = LocalDate.now();
-       return maintainPlanDetailMapper.appMaintainPlanDetailListByRoad(busiLineList, roadId, companyId, roleIds, now, finishState, planName);
+        QueryWrapper<MaintainPlanRoleDO> roleSql = new QueryWrapper<>();
+        roleSql.select("batch_no");
+        roleSql.lambda().in(MaintainPlanRoleDO::getRoleId, roleIds).
+                eq(MaintainPlanRoleDO::getCompanyId, companyId)
+                .eq(MaintainPlanRoleDO::getDeptId, deptId);
+        List<MaintainPlanRoleDO> roleList = maintainPlanRoleMapper.selectList(roleSql);
+        if (CollectionUtils.isEmpty(roleList)) {
+            return Collections.emptySet();
+        }
+        return roleList.stream().map(MaintainPlanRoleDO::getBatchNo).collect(Collectors.toSet());
     }
 }
 \ No newline at end of file
@@ -341,17 +341,14 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
     @Override
     public PageResult<AppMaintainPlanPageRoadRespVO> appMaintainPlanRoadPage(AppMaintainPlanPageRoadReqVO pageReqVO) {
         String busiLine = SecurityFrameworkUtils.getBusiLine();
-        Long companyId = SecurityFrameworkUtils.getCompanyId();
         if (StringUtils.isNotEmpty(busiLine)) {
             pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(",")));
         }
-        pageReqVO.setCompanyId(companyId);
-        /*1.查询登录用户角色*/
-        List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
-        pageReqVO.setRoleIds(roleIds);
+        /*1.查询登录用户计划编码列表*/
+        Set<String> batchNos = this.getBatchNosByLoginUserId();
+        pageReqVO.setBatchNos(batchNos);
         pageReqVO.setLocalDate(LocalDate.now());
-
         /*2.分页*/
         IPage<AppMaintainPlanPageRoadRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<AppMaintainPlanPageRoadRespVO> page = maintainPlanMapper.appMaintainPlanRoadPage(mpPage, pageReqVO);
@@ -359,6 +356,26 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
         return new PageResult<>(page.getRecords(), page.getTotal());
     }
+    /**
+     * 获取登录用户批次号List
+     */
+    private Set<String> getBatchNosByLoginUserId() {
+        Long companyId = SecurityFrameworkUtils.getCompanyId();
+        Long deptId = SecurityFrameworkUtils.getDeptId();
+        /*1.查询登录用户角色*/
+        List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
+        QueryWrapper<MaintainPlanRoleDO> roleSql = new QueryWrapper<>();
+        roleSql.select("batch_no");
+        roleSql.lambda().in(MaintainPlanRoleDO::getRoleId, roleIds).
+                eq(MaintainPlanRoleDO::getCompanyId, companyId)
+                .eq(MaintainPlanRoleDO::getDeptId, deptId);
+        List<MaintainPlanRoleDO> roleList = maintainPlanRoleMapper.selectList(roleSql);
+        if (CollectionUtils.isEmpty(roleList)) {
+            return Collections.emptySet();
+        }
+        return roleList.stream().map(MaintainPlanRoleDO::getBatchNo).collect(Collectors.toSet());
+    }
+
     @Override
     public PageResult<AppMaintainPlanPagePlanTypeRespVO> appMaintainPlanPlanTypePage(AppMaintainPlanPagePlanTypeReqVO pageReqVO) {
         String busiLine = SecurityFrameworkUtils.getBusiLine();
@@ -366,11 +383,9 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
         if (StringUtils.isNotEmpty(busiLine)) {
             pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(",")));
         }
-        pageReqVO.setCompanyId(companyId);
-
-        /*1.查询登录用户角色*/
-        List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
-        pageReqVO.setRoleIds(roleIds);
+        /*1.查询登录用户计划编码列表*/
+        Set<String> batchNos = this.getBatchNosByLoginUserId();
+        pageReqVO.setBatchNos(batchNos);
         pageReqVO.setLocalDate(LocalDate.now());
         /*2.分页*/
         IPage<AppMaintainPlanPagePlanTypeRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
@@ -32,8 +32,7 @@
         b.end_time
         FROM
         garden_inspection_plan a,
-        garden_inspection_plan_detail b,
-        garden_inspection_plan_role c
+        garden_inspection_plan_detail b
         WHERE
         a.batch_no = b.batch_no
         AND b.batch_no=c.batch_no
@@ -43,12 +42,6 @@
         AND a.deleted = 0
         AND a.batch_no = #{req.batchNo}
         AND a.company_id = #{req.companyId}
-        <if test="req.roleIds != null and req.roleIds.size() > 0">
-            AND c.role_id IN
-            <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
-                #{roleId}
-            </foreach>
-        </if>
         <if test="req.busiLineList != null and req.busiLineList.size() > 0">
             AND a.busi_line IN
             <foreach collection="req.busiLineList" item="busiLine" open="(" separator="," close=")">
@@ -79,4 +79,35 @@
         </if>
     </select>
+   <select id="appMaintainPlanCommitDetailPage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitDetailPageRespVO">
+       SELECT
+       a.batch_no,
+       a.plan_no,
+       b.plan_name,
+       b.road_id,
+       b.road_name,
+       b.level_id,
+       b.plan_attr,
+       b.plan_type_id,
+       b.cycle_id,
+       b.plan_num,
+       b.busi_line,
+       b.plan_finish_num,
+       a.begin_time,
+       a.end_time,
+       a.company_id,
+       a.dept_id,
+       a.finish_percent,
+       c.role_name,
+       c.finish_time,
+       c.user_name
+       FROM
+       garden_maintain_plan_detail a,
+       garden_maintain_plan b,
+       garden_maintain_plan_commit c
+       WHERE
+       a.batch_no = b.batch_no
+       AND a.plan_no = c.plan_no
+       AND c.plan_no = #{req.planNo}
+   </select>
 </mapper>
 \ No newline at end of file
@@ -13,7 +13,7 @@
         delete from garden_maintain_plan_detail where batch_no =#{batchNo}
     </delete>
-    <select id="appMaintainPlanDetailListByRoad" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanDetailRespVO">
+    <select id="appMaintainPlanDetailListByRoadPage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanDetailRespVO">
         SELECT
         c.batch_no,
         c.plan_no,
@@ -29,40 +29,61 @@
         c.sort_num
         FROM
         garden_maintain_plan a,
-        garden_maintain_plan_role b,
         garden_maintain_plan_detail c
-        WHERE
-        a.batch_no = b.batch_no
-        and a.batch_no=b.batch_no
-        AND a.dept_id =b.dept_id
+        WHERE a.batch_no=c.batch_no
         AND a.deleted=0
-        AND a.company_id = #{companyId}
-        AND a.road_id = #{roadId}
-        <if test="planName != null and planName !=''">
-            AND a.plan_name LIKE CONCAT('%',#{planName},'%')
+        AND a.road_id = #{req.roadId}
+        <if test="req.planName != null and req.planName !=''">
+            AND a.plan_name LIKE CONCAT('%',#{req.planName},'%')
         </if>
-        <if test="roleIds != null and roleIds.size() > 0">
-            AND b.role_id IN
-            <foreach collection="roleIds" item="roleId" open="(" separator="," close=")">
-                #{roleId}
-            </foreach>
-        </if>
-        <if test="busiLineList != null and busiLineList.size() > 0">
+        <if test="req.busiLineList != null and req.busiLineList.size() > 0">
             AND a.busi_line IN
-            <foreach collection="busiLineList" item="busiLine" open="(" separator="," close=")">
+            <foreach collection="req.busiLineList" item="busiLine" open="(" separator="," close=")">
                 #{busiLine}
             </foreach>
         </if>
+        <if test="req.batchNos != null and req.batchNos.size() > 0">
+            AND a.batch_no IN
+            <foreach collection="req.batchNos" item="batchNo" open="(" separator="," close=")">
+                #{batchNo}
+            </foreach>
+        </if>
         <!--状态 1:未完成;2:已完成;3:已失效-->
-        <if test="finishState == 3">
-            <![CDATA[and c.end_time < #{localDate}]]>
+        <if test="req.finishState == 3">
+            <![CDATA[and c.end_time < #{req.localDate}]]>
         </if>
-        <if test="finishState == 2">
-            and c.finish_state = #{finishState}
+        <if test="req.finishState == 2">
+            and c.finish_state = #{req.finishState}
         </if>
-        <if test="finishState == 1">
-            and c.finish_state = #{finishState}
-            <![CDATA[and c.end_time >= #{localDate}]]>
+        <if test="req.finishState == 1">
+            and c.finish_state = #{req.finishState}
+            <![CDATA[and c.end_time >= #{req.localDate}]]>
         </if>
     </select>
+
+    <select id="getMaintainNotFinishPlanCommitDetail" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailRespVO">
+        SELECT
+        c.batch_no,
+        c.plan_no,
+        a.plan_name,
+        a.plan_type_id,
+        a.rate,
+        a.cycle_id,
+        c.plan_num,
+        c.finish_percent,
+        c.finish_state,
+        c.begin_time,
+        c.end_time,
+        c.sort_num
+        FROM
+        garden_maintain_plan a,
+        garden_maintain_plan_detail c
+        WHERE a.batch_no=c.batch_no
+        AND a.deleted=0
+        AND c.plan_no = #{req.planNo}
+        AND a.plan_type_id = #{req.planTypeId}
+        <!--状态 1:未完成;2:已完成;3:已失效-->
+        and c.finish_state = #{req.finishState}
+        <![CDATA[and c.end_time >= #{req.localDate}]]>
+    </select>
 </mapper>
 \ No newline at end of file
@@ -20,25 +20,20 @@
         a.road_name,
         a.level_id,
         a.finish_state,
-        max(a.plan_num) as plan_num,
-        max(a.plan_finish_num) as plan_finish_num,
+        a.plan_num,
+        a.plan_finish_num,
         a.begin_time,
         a.end_time
         FROM
-        garden_maintain_plan a,
-        garden_maintain_plan_role b
-        WHERE
-        a.batch_no = b.batch_no
-        AND a.dept_id =b.dept_id
-        AND a.deleted=0
-        AND a.company_id = #{req.companyId}
+        garden_maintain_plan a
+        WHERE a.deleted=0
         <if test="req.roadName != null and req.roadName !=''">
             AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
         </if>
-        <if test="req.roleIds != null and req.roleIds.size() > 0">
-            AND b.role_id IN
-            <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
-                #{roleId}
+        <if test="req.batchNos != null and req.batchNos.size() > 0">
+            AND a.batch_no IN
+            <foreach collection="req.batchNos" item="batchNo" open="(" separator="," close=")">
+                #{batchNo}
             </foreach>
         </if>
         <if test="req.busiLineList != null and req.busiLineList.size() > 0">
@@ -58,14 +53,6 @@
             and a.finish_state = #{req.finishState}
             <![CDATA[and a.end_time >= #{req.localDate}]]>
         </if>
-        GROUP BY
-        a.batch_no,
-        a.road_id,
-        a.road_name,
-        a.level_id,
-        a.finish_state,
-        a.begin_time,
-        a.end_time
     </select>
     <select id="appMaintainPlanPlanTypePage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO">
@@ -83,22 +70,19 @@
             c.end_time
         FROM
             garden_maintain_plan a,
-            garden_maintain_plan_role b,
             garden_maintain_plan_detail c
         WHERE
-            a.batch_no = b.batch_no
-          and a.batch_no=b.batch_no
-          AND a.dept_id =b.dept_id
+            a.batch_no = c.batch_no
+        AND a.deleted=b.deleted
           AND a.deleted=0
-        AND a.company_id = #{req.companyId}
           AND a.plan_type_id = #{req.planTypeId}
         <if test="req.planName != null and req.planName !=''">
             AND a.plan_type_id LIKE CONCAT('%',#{req.planName},'%')
         </if>
-        <if test="req.roleIds != null and req.roleIds.size() > 0">
-            AND b.role_id IN
-            <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
-                #{roleId}
+        <if test="req.batchNos != null and req.batchNos.size() > 0">
+            AND a.batch_no IN
+            <foreach collection="req.batchNos" item="batchNo" open="(" separator="," close=")">
+                #{batchNo}
             </foreach>
         </if>
         <if test="req.busiLineList != null and req.busiLineList.size() > 0">