Merge branch 'dev' of http://gitlab1.renniting.cn/JCSS/urbanops into dev

# Conflicts: # urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java # urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenService.java # urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java

Merge branch 'dev' of http://gitlab1.renniting.cn/JCSS/urbanops into dev
# Conflicts: # urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java # urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenService.java # urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
颜惠青
2 parents 3a60ac74 b759a67e
Showing 59 changed files with 666 additions and 445 deletions
pom.xml
urbanops-module-api/pom.xml
urbanops-module-api/urbanops-module-garden-api/pom.xml
urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java
urbanops-module-api/urbanops-module-workorder-api/pom.xml
urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AdminUserRespVO.java
urbanops-module-garden/pom.xml
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApiImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanCommitController.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/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/inspectionplan/vo/AppInspectionPlanPageReqVO.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/AppMaintainPlanCommitSaveReqVO.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
@@ -21,6 +21,7 @@
 <!--        <module>urbanops-module-member</module>-->
         <module>urbanops-module-bpm</module>
         <module>urbanops-module-report</module>
+        <module>urbanops-module-api</module>
 <!--        <module>urbanops-module-mp</module>-->
 <!--        <module>urbanops-module-pay</module>-->
 <!--        <module>urbanops-module-mall</module>-->
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>urbanops</artifactId>
+        <groupId>com.zteits.boot</groupId>
+        <version>${revision}</version>
+    </parent>
+    <packaging>pom</packaging>
+    <modules>
+        <module>urbanops-module-workorder-api</module>
+        <module>urbanops-module-garden-api</module>
+    </modules>
+
+    <artifactId>urbanops-module-api</artifactId>
+    <description>
+        该包是技术组件，每个子包，代表一个组件。每个组件包括两部分：
+        1. core 包：是该组件的核心封装
+        2. config 包：是该组件基于 Spring 的配置
+
+        技术组件，也分成两类：
+        1. 框架组件：和我们熟悉的 MyBatis、Redis 等等的拓展
+        2. 业务组件：和业务相关的组件的封装，例如说数据字典、操作日志等等。
+        如果是业务组件，Maven 名字会包含 biz
+    </description>
+    <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
+
+</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <artifactId>urbanops-module-api</artifactId>
+        <groupId>com.zteits.boot</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>urbanops-module-garden-api</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        bpm 包下，业务流程管理（Business Process Management），我们放工作流的功能。
+        例如说：流程定义、表单配置、审核中心（我的申请、我的待办、我的已办）等等
+        bpm 解释：https://baike.baidu.com/item/BPM/1933
+
+        工作流基于 Flowable 6 实现，分成流程定义、流程表单、流程实例、流程任务等功能模块。
+    </description>
+    <dependencies>
+        <!-- Web 相关 -->
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-spring-boot-starter-web</artifactId>
+        </dependency>
+        <!-- Test 测试相关 -->
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-spring-boot-starter-test</artifactId>
+        </dependency>
+    </dependencies>
+</project>
 package com.zteits.urbanops.module.garden.api.material;
-import com.zteits.urbanops.module.garden.api.material.dto.MaterialInventoryOutDto;
+
+import com.zteits.urbanops.module.garden.dto.material.MaterialInventoryOutDto;
 /**
  * @Classname MaterialApi
+package com.zteits.urbanops.module.garden.api.road;
+
+
+import com.zteits.urbanops.module.garden.dto.road.RoadReqDTO;
+import com.zteits.urbanops.module.garden.dto.road.RoadRespDTO;
+import com.zteits.urbanops.module.garden.dto.road.RoadStreetRespDTO;
+
+import java.util.List;
+
+public interface RoadApi {
+    List<RoadRespDTO> getRoadInfoBy(RoadReqDTO reqDTO);
+
+    RoadStreetRespDTO getRoadInfoById(Long id);
+}
-package com.zteits.urbanops.module.garden.api.material.dto;
+package com.zteits.urbanops.module.garden.dto.material;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
-package com.zteits.urbanops.module.garden.api.road.dto;
+package com.zteits.urbanops.module.garden.dto.road;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
-package com.zteits.urbanops.module.garden.api.road.dto;
+package com.zteits.urbanops.module.garden.dto.road;
 import lombok.Data;
-package com.zteits.urbanops.module.garden.api.road.dto;
+package com.zteits.urbanops.module.garden.dto.road;
-import cn.idev.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 /**
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <artifactId>urbanops-module-api</artifactId>
+        <groupId>com.zteits.boot</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>urbanops-module-workorder-api</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        bpm 包下，业务流程管理（Business Process Management），我们放工作流的功能。
+        例如说：流程定义、表单配置、审核中心（我的申请、我的待办、我的已办）等等
+        bpm 解释：https://baike.baidu.com/item/BPM/1933
+
+        工作流基于 Flowable 6 实现，分成流程定义、流程表单、流程实例、流程任务等功能模块。
+    </description>
+    <dependencies>
+        <!-- Web 相关 -->
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-spring-boot-starter-web</artifactId>
+        </dependency>
+        <!-- Test 测试相关 -->
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-spring-boot-starter-excel</artifactId>
+        </dependency>
+    </dependencies>
+</project>
-package com.zteits.urbanops.module.workorder.api.workorder;
+package com.zteits.urbanops.module.workorder.api;
-import com.zteits.urbanops.framework.common.pojo.PageResult;
-import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO;
-import com.zteits.urbanops.module.workorder.controller.app.garden.vo.AppGardenWorkOrderReqVO;
-import com.zteits.urbanops.module.workorder.controller.app.garden.vo.AppGardenWorkOrderRespVO;
+import com.zteits.urbanops.module.workorder.dto.AdminUserRespVO;
+import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO;
+import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderRespVO;
 import java.util.List;
@@ -25,7 +24,7 @@ public interface WorkOrderApi {
      * @param notHas false 不包含loginUserId
      * @return
      */
-    public List<AdminUserRespDTO> getUserByLoginIdAndRoleCode(Long loginUserId, String roleCode, String busiLine, boolean notHas);
+    public List<AdminUserRespVO> getUserByLoginIdAndRoleCode(Long loginUserId, String roleCode, String busiLine, boolean notHas);
     /**
      * 通过道路 roadId 获取 当前人所在部门的 且对应的用户角色为roleCode的人员,按业务线busiLine 筛选
@@ -34,7 +33,7 @@ public interface WorkOrderApi {
      * @param busiLine
      * @return
      */
-    public List<AdminUserRespDTO> getUserByRoadIdAndRoleCode(Long roadId,String roleCode,String busiLine);
+    public List<AdminUserRespVO> getUserByRoadIdAndRoleCode(Long roadId, String roleCode, String busiLine);
     /**
      * 创建工单API
+package com.zteits.urbanops.module.workorder.dto;
+
+import com.zteits.urbanops.framework.common.enums.CommonStatusEnum;
+import lombok.Data;
+
+import java.util.Set;
+
+/**
+ * Admin 用户 Response DTO
+ *
+ * @author ZIEITS
+ */
+@Data
+public class AdminUserRespVO {
+
+    /**
+     * 用户ID
+     */
+    private Long id;
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+    /**
+     * 帐号状态
+     *
+     * 枚举 {@link CommonStatusEnum}
+     */
+    private Integer status;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+    /**
+     * 岗位编号数组
+     */
+    private Set<Long> postIds;
+    /**
+     * 手机号码
+     */
+    private String mobile;
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+}
-package com.zteits.urbanops.module.workorder.controller.app.garden.vo;
+package com.zteits.urbanops.module.workorder.dto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
@@ -9,7 +9,6 @@ import org.hibernate.validator.constraints.Length;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Map;
 /**
  * @author yanhuiqing
@@ -93,3 +92,4 @@ public class AppGardenWorkOrderReqVO {
 }
+
-package com.zteits.urbanops.module.workorder.controller.app.garden.vo;
+package com.zteits.urbanops.module.workorder.dto;
-import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-package com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo;
+package com.zteits.urbanops.module.workorder.dto;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
+import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import cn.idev.excel.annotation.*;
+import java.util.List;
+import java.util.Set;
 @Schema(description = "管理后台 - 工单信息 Response VO")
 @Data
@@ -129,7 +129,19 @@
         <dependency>
             <groupId>com.zteits.boot</groupId>
             <artifactId>urbanops-module-bpm</artifactId>
-            <version>2025.10-SNAPSHOT</version>
+            <version>${revision}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-module-workorder-api</artifactId>
+            <version>${revision}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-module-garden-api</artifactId>
+            <version>${revision}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
 package com.zteits.urbanops.module.garden.api.material;
 import cn.hutool.core.bean.BeanUtil;
-import com.zteits.urbanops.module.garden.api.material.dto.MaterialInventoryOutDto;
 import com.zteits.urbanops.module.garden.controller.admin.materialinventoryout.vo.MaterialInventoryOutSaveReqVO;
+import com.zteits.urbanops.module.garden.dto.material.MaterialInventoryOutDto;
 import com.zteits.urbanops.module.garden.service.materialinventoryout.MaterialInventoryOutService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -16,7 +16,7 @@ import org.springframework.validation.annotation.Validated;
  */
 @Service
 @Validated
-public class MaterialApiImpl implements MaterialApi{
+public class MaterialApiImpl implements MaterialApi {
     @Resource
     private MaterialInventoryOutService materialInventoryOutService;
-package com.zteits.urbanops.module.garden.api.road;
-
-import com.zteits.urbanops.module.garden.api.road.dto.RoadReqDTO;
-import com.zteits.urbanops.module.garden.api.road.dto.RoadRespDTO;
-import com.zteits.urbanops.module.garden.api.road.dto.RoadStreetRespDTO;
-
-import java.util.List;
-
-/**
- * @author yanhuiqing
- * @version 1.0
- * @description: 道路api 通过经纬度 系统编码获取道路信息
- * @date 2025/12/9 22:12
- */
-public interface RoadApi {
-    public List<RoadRespDTO> getRoadInfoBy(RoadReqDTO reqDTO);
-
-    public RoadStreetRespDTO getRoadInfoById(Long id);
-}
@@ -5,10 +5,10 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.zteits.urbanops.framework.common.util.http.HttpUtils;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
-import com.zteits.urbanops.module.garden.api.road.dto.RoadReqDTO;
-import com.zteits.urbanops.module.garden.api.road.dto.RoadRespDTO;
-import com.zteits.urbanops.module.garden.api.road.dto.RoadStreetRespDTO;
 import com.zteits.urbanops.module.garden.controller.admin.road.vo.RoadRespVO;
+import com.zteits.urbanops.module.garden.dto.road.RoadReqDTO;
+import com.zteits.urbanops.module.garden.dto.road.RoadRespDTO;
+import com.zteits.urbanops.module.garden.dto.road.RoadStreetRespDTO;
 import com.zteits.urbanops.module.garden.service.road.RoadService;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-public class RoadApiImpl implements RoadApi{
+public class RoadApiImpl implements RoadApi {
     @Value("${siot.roadUrl}")
     private String roadInfoUrl;
@@ -17,6 +17,13 @@ public class InspectionPlanCommitRespVO {
     @ExcelProperty("计划编码")
     private String planNo;
+    /**
+     * 排序号:第n次计划提交
+     */
+    @Schema(description = "排序号")
+    @ExcelProperty("排序号")
+    private Integer sortNum;
+
     @Schema(description = "计划名称")
     @ExcelProperty("计划名称")
     private String planName;
@@ -83,8 +83,9 @@ public class MaintainPlanCommitController {
     @Operation(summary = "获取养护计划-共同处理人明细")
     @Parameter(name = "plan_no", description = "计划编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:query')")
-    public CommonResult<List<MaintainPlanCommitDetailRespVO>> getMaintainPlanCommitDetailByPlanNo(@RequestParam("plan_no") String planNo) {
-        return success( maintainPlanCommitService.getMaintainPlanCommitDetailByPlanNo(planNo));
+    public CommonResult<List<MaintainPlanCommitDetailRespVO>> getMaintainPlanCommitDetailByPlanNo(@RequestParam("plan_no") String planNo,
+                                                                                                  @RequestParam(value="sort_num", required = false) String  sortNum) {
+        return success( maintainPlanCommitService.getMaintainPlanCommitDetailByPlanNo(planNo, sortNum));
     }
     @GetMapping("/page")
@@ -40,13 +40,6 @@ public class MaintainPlanCommitDetailRespVO {
     @ExcelProperty("备注")
     private String remark;
-    @Schema(description = "总完成百分比", example = "98.00")
-    private Integer totalFinishNum;
-
-    @Schema(description = "本次完成百分比", example = "98.00")
-    @ExcelProperty("本次完成百分比")
-    private Integer finishPercent;
-
     @Schema(description = "照片host", example = "aaa")
     @ExcelProperty("照片host")
     private String imgHost;
 package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.zteits.urbanops.framework.mybatis.core.type.StringListTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.time.LocalDateTime;
+import java.util.List;
 import cn.idev.excel.annotation.*;
@@ -67,14 +70,15 @@ public class MaintainPlanCommitRespVO {
     @ExcelProperty("养护类型")
     private Integer planTypeId;
-    @Schema(description = "本次完成百分比")
-    @ExcelProperty("本次完成百分比")
-    private Integer finishPercent;
-
     @Schema(description = "完成次数")
     @ExcelProperty("完成次数")
     private Integer planFinishNum;
+    @Schema(description = "照片")
+    @ExcelProperty("照片")
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> beginImgList;
+
     @Schema(description = "完成时间")
     @ExcelProperty("完成时间")
     private LocalDateTime finishTime;
@@ -20,10 +20,10 @@ public class AppInspectionPlanDetailReqVO {
     @NotBlank(message = "批次号不能为空")
     private String batchNo;
-    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
+    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效;4:已终止")
     @NotNull(message = "完成状态不能为空")
     @Min(value = 1, message = "状态最小为1")
-    @Max(value = 3, message = "状态不能大于4")
+    @Max(value = 4, message = "状态不能大于4")
     private Integer finishState;
     @Schema(description = "公司ID")
@@ -34,8 +34,13 @@ public class AppInspectionPlanDetailReqVO {
     @Hidden
     private List<String> busiLineList;
-    @Schema(description = "系统时间")
+    @Schema(description = "部门")
+    @Hidden
+    private Long deptId;
+
+    @Schema(description = "开始时间")
     @Hidden
     private LocalDateTime localDateTime;
+
 }
@@ -8,7 +8,7 @@ import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
@@ -19,22 +19,27 @@ public class AppInspectionPlanPageReqVO extends PageParam {
     @Schema(description = "道路名称", example = "赵六")
     private String roadName;
-    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
+    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效;4:已终止")
     @NotNull(message = "完成状态不能为空")
     @Min(value = 1, message = "状态最小为1")
-    @Max(value = 3, message = "状态不能大于4")
+    @Max(value = 4, message = "状态不能大于4")
     private Integer finishState;
     @Schema(description = "批次号列表")
     @Hidden
-    private Set<String> batchNos;
+    private Set<Long> roleIds;
     @Schema(description = "业务线")
     @Hidden
     private List<String> busiLineList;
+    @Schema(description = "部门")
+    @Hidden
+    private Long deptId;
+
     @Schema(description = "系统时间")
     @Hidden
-    private LocalDate localDate;
+    private LocalDateTime localDateTime;
+
 }
 package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo;
 import cn.idev.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.zteits.urbanops.framework.mybatis.core.type.StringListTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -42,9 +44,7 @@ public class AppMaintainPlanCommitDetailPageRespVO {
     private String imgHost;
     @Schema(description = "开始照片")
-    private String beginImg;
-
-    @Schema(description = "开始照片")
+    @TableField(typeHandler = StringListTypeHandler.class)
     private List<String> beginImgList;
     /**
@@ -56,9 +56,6 @@ public class AppMaintainPlanCommitDetailPageRespVO {
      */
     private Double opTime;
-    @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Integer finishPercent;
-
     @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成", requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer finishState;
@@ -16,10 +16,6 @@ public class AppMaintainPlanCommitSaveReqVO {
     @NotEmpty(message = "计划编码不能为空")
     private String planNo;
-    @Schema(description = "本次总完成百分比", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "本次总完成百分比不能为空")
-    private Integer totalFinishPercent;
-
     @Schema(description = "照片host", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "照片host不能为空")
     private String imgHost;
@@ -23,24 +23,21 @@ public class AppMaintainPlanDetailListByRoadPageReqVO extends PageParam {
     @NotNull
     private Long roadId;
-    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
+    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效；4:终止")
     @NotNull(message = "完成状态不能为空")
     @Min(value = 1, message = "状态最小为1")
-    @Max(value = 3, message = "状态不能大于4")
+    @Max(value = 4, 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
+    @Schema(description = "开始时间")
     private LocalDateTime localDateTime;
+
 }
@@ -30,20 +30,25 @@ public class AppMaintainPlanPagePlanTypeReqVO extends PageParam {
     @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
     @NotNull(message = "完成状态不能为空")
     @Min(value = 1, message = "状态最小为1")
-    @Max(value = 3, message = "状态不能大于4")
+    @Max(value = 4, message = "状态不能大于4")
     private Integer finishState;
     @Schema(description = "计划批次号列表")
     @Hidden
-    private Set<String> batchNos;
+    private Set<Long> roleIds;
     @Schema(description = "业务线")
     @Hidden
     private List<String> busiLineList;
-    @Schema(description = "系统时间")
+    @Schema(description = "部门id")
+    @Hidden
+    private Long deptId;
+
+    @Schema(description = "开始时间")
     @Hidden
     private LocalDateTime localDateTime;
+
 }
 \ No newline at end of file
@@ -8,7 +8,7 @@ import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
@@ -23,23 +23,29 @@ public class AppMaintainPlanPageRoadReqVO extends PageParam {
      * 完成状态 1:未完成;2:已完成;3:已失效
      * @see com.zteits.urbanops.module.garden.enums.FinishStateEnum
      */
-    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
+    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效;4:已终止")
     @NotNull(message = "完成状态不能为空")
     @Min(value = 1, message = "状态最小为1")
-    @Max(value = 3, message = "状态不能大于4")
+    @Max(value = 4, message = "状态不能大于4")
     private Integer finishState;
-    @Schema(description = "批次号")
+    @Schema(description = "角色id列表")
     @Hidden
-    private Set<String> batchNos;
+    private Set<Long> roleIds;
     @Schema(description = "业务线")
     @Hidden
     private List<String> busiLineList;
-    @Schema(description = "系统时间")
+    @Schema(description = "部门id")
     @Hidden
-    private LocalDate localDate;
+    private Long deptId;
+
+    @Schema(description = "当前时间")
+    @Hidden
+    private LocalDateTime localDateTime;
+
+
 }
 \ No newline at end of file
@@ -35,10 +35,10 @@ public class AppMaintainPlanPageRoadRespVO{
     @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "8588")
     private Integer levelId;
-    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
+    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效；4:已终止")
     @NotNull(message = "完成状态不能为空")
     @Min(value = 1, message = "状态最小为1")
-    @Max(value = 3, message = "状态不能大于4")
+    @Max(value = 4, message = "状态不能大于5")
     private Integer finishState;
     @Schema(description = "计划次数", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -50,11 +50,9 @@ public class AppMaintainPlanPageRoadRespVO{
     private Integer planFinishNum;
     @Schema(description = "执行开始时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDate beginTime;
     @Schema(description = "执行时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDate endTime;
 }
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.convert;
+
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanCommitSaveReqVO;
+import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDO;
+import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadDO;
+import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Mapper
+public interface AppGardenWorkOrderConvert {
+
+    public static final AppGardenWorkOrderConvert INSTANCE = Mappers.getMapper(AppGardenWorkOrderConvert.class);
+
+    default AppGardenWorkOrderReqVO buildAppGardenWorkOrderReqVO(AppInspectionPlanCommitSaveReqVO createReqVO, InspectionPlanDO inspectionPlanDO, RoadDO roadDO, String planNo ) {
+        AppGardenWorkOrderReqVO  orderReqVO = new AppGardenWorkOrderReqVO();
+        orderReqVO.setRoadId(inspectionPlanDO.getRoadId());
+        orderReqVO.setRoadName(inspectionPlanDO.getRoadName());
+        orderReqVO.setImgs(createReqVO.getImgList());
+        orderReqVO.setRemark(createReqVO.getRemark());
+        orderReqVO.setPressingType(2);//紧急
+        orderReqVO.setOrderName(inspectionPlanDO.getPlanName());
+        orderReqVO.setSourceId(1);//来源ID 工单来源  1、巡查
+        orderReqVO.setSourceName("园林巡查上报");
+        orderReqVO.setThirdWorkNo(planNo);
+        orderReqVO.setFinishDate(LocalDateTime.now());
+        orderReqVO.setBusiLine(inspectionPlanDO.getBusiLine());
+        orderReqVO.setLatLonType(3);
+        orderReqVO.setLat(new BigDecimal(roadDO.getStartingLatitude()));
+        orderReqVO.setLon(new BigDecimal(roadDO.getStartingLongitude()));
+        orderReqVO.setLonLatAddress(roadDO.getStartingRemark());
+        return orderReqVO;
+    }
+}
@@ -59,10 +59,6 @@ public class MaintainPlanCommitDO extends BaseDO {
      */
     private Long roadId;
     /**
-     * 本次完成百分比
-     */
-    private Integer finishPercent;
-    /**
      * 照片host
      */
     private String imgHost;
@@ -36,10 +36,4 @@ public interface MaintainPlanCommitMapper extends BaseMapperX&lt;MaintainPlanCommit
      */
     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
@@ -19,7 +19,7 @@ public enum FinishStateEnum {
     EXPIRED(3),
     /**
-     * 过期
+     * 已终止
      */
     STOP(4),
@@ -14,16 +14,24 @@ import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.Insp
 import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanCommitSaveReqVO;
 import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanCommitRespVO;
 import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanCommitSaveReqVO;
+import com.zteits.urbanops.module.garden.convert.AppGardenWorkOrderConvert;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanCommitDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDetailDO;
+import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadDO;
 import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanCommitMapper;
 import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanDetailMapper;
 import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanMapper;
+import com.zteits.urbanops.module.garden.dal.mysql.road.RoadMapper;
+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 com.zteits.urbanops.module.system.api.permission.RoleApi;
+import com.zteits.urbanops.module.workorder.api.WorkOrderApi;
+import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO;
+import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderRespVO;
 import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -45,6 +53,7 @@ import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.INSPECT
  */
 @Service
 @Validated
+@Slf4j
 public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitService {
     @Resource
@@ -57,10 +66,13 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
     private InspectionPlanDetailMapper inspectionPlanDetailMapper;
     @Resource
+    private RoadMapper roadMapper;
+
+    @Resource
     private DeptApi deptApi;
     @Resource
-    private RoleApi roleApi;
+    private WorkOrderApi workOrderApi;
     @Override
     public Long createInspectionPlanCommit(InspectionPlanCommitSaveReqVO createReqVO) {
@@ -86,21 +98,23 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
         if(null == inspectionPlanDO){
             throw exception(INSPECTION_PLAN_NOT_EXISTS);
         }
+        /*3.转工单*/
+        String orderNO =  addWorkOrder(createReqVO, inspectionPlanDO);
         InspectionPlanCommitDO inspectionPlanCommit = getInspectionPlanCommitDO(createReqVO, inspectionPlanDO);
-
-        /*3.查询计划明细最大次数*/
+        inspectionPlanCommit.setTransWorkNo(orderNO);
+        /*4.查询计划明细最大次数*/
         Long countNum = inspectionPlanCommitMapper.selectCount(new QueryWrapper<InspectionPlanCommitDO>().lambda()
                 .eq(InspectionPlanCommitDO::getPlanNo, createReqVO.getPlanNo()));
         inspectionPlanCommit.setSortNum(countNum.intValue() + 1);
-        /*4.插入明细*/
+        /*5.插入明细*/
         inspectionPlanCommitMapper.insert(inspectionPlanCommit);
         Integer detailFinishNum = inspectionPlanDetailDO.getPlanFinishNum() + 1;
-        int detailFinishState = 1;
+        int detailFinishState = FinishStateEnum.NOT_FINISHED.getStatus();
         if(detailFinishNum.equals(inspectionPlanDetailDO.getPlanNum())){
-            detailFinishState = 2;
+            detailFinishState = FinishStateEnum.FINISHED.getStatus();
         }
         LambdaUpdateWrapper<InspectionPlanDetailDO> detailUpdateSql = new LambdaUpdateWrapper<InspectionPlanDetailDO>()
                 .set(InspectionPlanDetailDO::getPlanFinishNum, detailFinishNum)
@@ -110,9 +124,9 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
         inspectionPlanDetailMapper.update(detailUpdateSql);
         Integer planFinishNum = inspectionPlanDO.getPlanFinishNum() + 1;
-        int planFinishState = 1;
+        int planFinishState = FinishStateEnum.NOT_FINISHED.getStatus();
         if(planFinishNum.equals(inspectionPlanDO.getPlanNum())){
-            planFinishState = 2;
+            planFinishState = FinishStateEnum.FINISHED.getStatus();
         }
         LambdaUpdateWrapper<InspectionPlanDO> updateSql = new LambdaUpdateWrapper<InspectionPlanDO>()
                 .set(InspectionPlanDO::getPlanFinishNum, planFinishNum)
@@ -124,6 +138,25 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
         return 1L;
     }
+    /**
+     * 转工单
+     * @param createReqVO
+     * @param inspectionPlanDO
+     * @return
+     */
+    private String addWorkOrder(AppInspectionPlanCommitSaveReqVO createReqVO, InspectionPlanDO inspectionPlanDO) {
+        //转交状态: 1:未转交;2:已转交
+        if (createReqVO.getTransState().equals(1)) {
+            return null;
+        }
+        //查询道路信息
+        RoadDO roadDO = roadMapper.selectOne(RoadDO::getId, inspectionPlanDO.getRoadId());
+        AppGardenWorkOrderReqVO appGardenWorkOrderReqVO = AppGardenWorkOrderConvert.INSTANCE.buildAppGardenWorkOrderReqVO(createReqVO, inspectionPlanDO, roadDO, createReqVO.getPlanNo());
+        AppGardenWorkOrderRespVO workOrder = workOrderApi.createWorkOrder(appGardenWorkOrderReqVO);
+        log.info("创建工单结果:{}", JSONObject.toJSONString(workOrder));
+        return workOrder.getOrderNo();
+    }
+
     private static InspectionPlanCommitDO getInspectionPlanCommitDO(AppInspectionPlanCommitSaveReqVO createReqVO, InspectionPlanDO inspectionPlanDO) {
         LocalDateTime now = LocalDateTime.now();
         Long userId = SecurityFrameworkUtils.getLoginUserId();
@@ -242,11 +275,5 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
         });
     }
-//    private List<InspectionPlanCommitRespVO> imgProcess(List<InspectionPlanCommitRespVO> list) {
-//        list.forEach(e -> {
-//            e.setImgList(StrUtils.imgProcess(e.getImg(), ""));
-//        });
-//        return list;
-//    }
 }
@@ -100,6 +100,7 @@ public class InspectionPlanDetailServiceImpl implements InspectionPlanDetailServ
             pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(",")));
         }
         pageReqVO.setCompanyId(companyId);
+        pageReqVO.setDeptId(SecurityFrameworkUtils.getDeptId());
         pageReqVO.setLocalDateTime(LocalDateTime.now());
          /*2.明细*/
@@ -52,7 +52,6 @@ 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 实现类
@@ -365,13 +364,13 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
         }
         /*1.查询登录用户角色*/
-        Set<String> batchNos = this.getBatchNosByLoginUserId();
-        if(CollectionUtils.isEmpty(batchNos)){
-           return PageResult.empty();
+        List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
+        if (CollectionUtils.isEmpty(roleIds)) {
+            return new PageResult<>(null, 0L);
         }
-
-        pageReqVO.setBatchNos(batchNos);
-        pageReqVO.setLocalDate(LocalDate.now());
+        pageReqVO.setDeptId(SecurityFrameworkUtils.getDeptId());
+        pageReqVO.setRoleIds(new HashSet<>(roleIds));
+        pageReqVO.setLocalDateTime(LocalDateTime.now());
         /*2.分页*/
         IPage<AppInspectionPlanRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<AppInspectionPlanRespVO> page = inspectionPlanMapper.getInspectionPlanAppPage(mpPage, pageReqVO);
@@ -400,29 +399,6 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
         });
     }
-    /**
-     * 获取登录用户批次号List
-     */
-    private Set<String> getBatchNosByLoginUserId() {
-        Long companyId = SecurityFrameworkUtils.getCompanyId();
-        Long deptId = SecurityFrameworkUtils.getDeptId();
-        /*1.查询登录用户角色*/
-        List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
-        if (CollectionUtils.isEmpty(roleIds)) {
-            return Collections.emptySet();
-        }
-        QueryWrapper<InspectionPlanRoleDO> roleSql = new QueryWrapper<>();
-        roleSql.select("batch_no");
-        roleSql.lambda().in(InspectionPlanRoleDO::getRoleId, roleIds).
-                eq(InspectionPlanRoleDO::getCompanyId, companyId)
-                .eq(InspectionPlanRoleDO::getDeptId, deptId);
-        List<InspectionPlanRoleDO> roleList = inspectionPlanRoleMapper.selectList(roleSql);
-        if (CollectionUtils.isEmpty(roleList)) {
-            return Collections.emptySet();
-        }
-        return roleList.stream().map(InspectionPlanRoleDO::getBatchNo).collect(Collectors.toSet());
-    }
-
     @Override
     public void updateExpiredInspectionPlans() {
         // 更新过期的计划状态为过期(3)
@@ -70,7 +70,7 @@ public interface MaintainPlanCommitService {
      * @param planNo 计划编号
      * @return 养护计划明细列表
      */
-    List<MaintainPlanCommitDetailRespVO> getMaintainPlanCommitDetailByPlanNo(String planNo);
+    List<MaintainPlanCommitDetailRespVO> getMaintainPlanCommitDetailByPlanNo(String planNo, String sortNum);
     /**
      * 获得养护计划明细分页
@@ -94,9 +94,8 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
             throw exception(MAINTAIN_PLAN_NOT_EXISTS);
         }
+        //排序号
         int sortNum = maintainPlanDetailDO.getPlanFinishNum() +1;
-        /*3.查询已完成比例*/
-//        int finishPercent = maintainPlanCommitMapper.selectFinishPercent(createReqVO.getPlanNo(), sortNum);
         MaintainPlanCommitDO commitDO = new MaintainPlanCommitDO();
         commitDO.setBatchNo(maintainPlanDO.getBatchNo());
@@ -108,7 +107,6 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
         commitDO.setCompanyId(maintainPlanDO.getCompanyId());
         commitDO.setDeptId(maintainPlanDO.getDeptId());
         commitDO.setRoadId(maintainPlanDO.getRoadId());
-        commitDO.setFinishPercent(createReqVO.getTotalFinishPercent());
         commitDO.setImgHost(createReqVO.getImgHost());
         commitDO.setBeginImg(JSONObject.toJSONString(createReqVO.getBeginImg()));
         commitDO.setProcessImg("[]");
@@ -145,40 +143,34 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
         }
-        int detailFinishNum =  maintainPlanDetailDO.getPlanFinishNum();
-        if(createReqVO.getTotalFinishPercent().equals(100)){
-            detailFinishNum = detailFinishNum + 1;
-        }
-
+        int detailFinishNum =  maintainPlanDetailDO.getPlanFinishNum() + 1;
         //完成状态 1:未完成;2:已完成
         int detailFinishState = FinishStateEnum.NOT_FINISHED.getStatus();
         if(detailFinishNum == maintainPlanDetailDO.getPlanNum()){
             detailFinishState = FinishStateEnum.FINISHED.getStatus();
         }
-        //完成状态 1:未完成;2:已完成
-        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 = FinishStateEnum.FINISHED.getStatus();
-            }
-            LambdaUpdateWrapper<MaintainPlanDO> maintainPlanDOSql = new LambdaUpdateWrapper<MaintainPlanDO>()
-                    .set(MaintainPlanDO::getPlanFinishNum, maintainPlanDO.getPlanFinishNum()+1)
-                    .set(MaintainPlanDO::getFinishState, finishState)
-                    .set(MaintainPlanDO::getUpdateTime, LocalDateTime.now())
-                    .eq(MaintainPlanDO::getBatchNo, maintainPlanDO.getBatchNo());
-            //更新计划汇总
-            maintainPlanMapper.update(maintainPlanDOSql);
-        }
+        //更新明细
+        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);
+
+        Integer planFinishNum = maintainPlanDO.getPlanFinishNum()+1;
+        int finishState = FinishStateEnum.NOT_FINISHED.getStatus();
+        if(maintainPlanDO.getPlanNum().equals(planFinishNum)){
+            finishState = FinishStateEnum.FINISHED.getStatus();
+        }
+        LambdaUpdateWrapper<MaintainPlanDO> maintainPlanDOSql = new LambdaUpdateWrapper<MaintainPlanDO>()
+                .set(MaintainPlanDO::getPlanFinishNum, planFinishNum)
+                .set(MaintainPlanDO::getFinishState, finishState)
+                .set(MaintainPlanDO::getUpdateTime, LocalDateTime.now())
+                .eq(MaintainPlanDO::getBatchNo, maintainPlanDO.getBatchNo());
+        //更新计划汇总
+        maintainPlanMapper.update(maintainPlanDOSql);
         return commitDO.getId();
     }
@@ -222,21 +214,18 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
         //分页
         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) {
+    public List<MaintainPlanCommitDetailRespVO> getMaintainPlanCommitDetailByPlanNo(String planNo, String sortNum) {
         List<MaintainPlanCommitDetailRespVO> respList = new ArrayList<>();
         /*1.查询处理明细*/
         List<MaintainPlanCommitDO> list = maintainPlanCommitMapper.selectList(new QueryWrapper<MaintainPlanCommitDO>().lambda()
-                .eq(MaintainPlanCommitDO::getPlanNo, planNo).eq(MaintainPlanCommitDO::getDeleted, 0));
+                .eq(MaintainPlanCommitDO::getPlanNo, planNo)
+                .eq(null != sortNum, MaintainPlanCommitDO::getSortNum, sortNum)
+                .eq(MaintainPlanCommitDO::getDeleted, 0));
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
         }
@@ -250,7 +239,6 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
             respVO.setBeginImgList(StrUtils.imgProcess(e.getBeginImg(), ""));
             respVO.setProcessImgList(StrUtils.imgProcess(e.getProcessImg(), ""));
             respVO.setEndImgList(StrUtils.imgProcess(e.getEndImg(), ""));
-            respVO.setTotalFinishNum(maintainPlanDetailDO.getPlanFinishNum());
             List<MaintainPlanCommonUserVO> commonUsers = new ArrayList<>();
             List<MaintainPlanCommonUserDO> maintainPlanCommonUserList = maintainPlanCommonUserMapper.selectList(new QueryWrapper<MaintainPlanCommonUserDO>().lambda()
                     .eq(MaintainPlanCommonUserDO::getParentId, maintainPlanDetailDO.getId())
@@ -114,11 +114,7 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService 
         if (StringUtils.isNotEmpty(busiLine)) {
             pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(",")));
         }
-
-        /*1.查询登录用户角色*/
-//        Set<String> batchNos = this.getBatchNosByLoginUserId();
-//        pageReqVO.setLocalDateTime(LocalDateTime.now());
-//        pageReqVO.setBatchNos(batchNos);
+        pageReqVO.setLocalDateTime(LocalDateTime.now());
         /*2.分页*/
         IPage<AppMaintainPlanDetailRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<AppMaintainPlanDetailRespVO> page = maintainPlanDetailMapper.appMaintainPlanDetailListByRoadPage(mpPage, pageReqVO);
@@ -128,8 +124,6 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService 
     @Override
     public List<AppMaintainNotFinishPlanDetailRespVO> getMaintainNotFinishPlanCommitDetail(AppMaintainNotFinishPlanDetailReqVO reqVO) {
-        //完成状态 1:未完成;2:已完成;3:已失效
-//        reqVO.setFinishState(1);
         reqVO.setLocalDateTime(LocalDateTime.now());
         return maintainPlanDetailMapper.getMaintainNotFinishPlanCommitDetail(reqVO);
     }
@@ -377,13 +377,14 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
             pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(",")));
         }
-        /*1.查询登录用户计划编码列表*/
-        Set<String> batchNos = this.getBatchNosByLoginUserId();
-        if(CollectionUtils.isEmpty(batchNos)){
-            return PageResult.empty();
+        /*1.查询登录用户角色*/
+        List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
+        if (CollectionUtils.isEmpty(roleIds)) {
+            new PageResult<>(null, 0L);
         }
-        pageReqVO.setBatchNos(batchNos);
-        pageReqVO.setLocalDate(LocalDate.now());
+        pageReqVO.setRoleIds(new HashSet<>(roleIds));
+        pageReqVO.setDeptId(SecurityFrameworkUtils.getDeptId());
+        pageReqVO.setLocalDateTime(LocalDateTime.now());
         /*2.分页*/
         IPage<AppMaintainPlanPageRoadRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<AppMaintainPlanPageRoadRespVO> page = maintainPlanMapper.appMaintainPlanRoadPage(mpPage, pageReqVO);
@@ -391,29 +392,6 @@ 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());
-        if (CollectionUtils.isEmpty(roleIds)) {
-            return Collections.emptySet();
-        }
-        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();
@@ -421,11 +399,12 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
             pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(",")));
         }
         /*1.查询登录用户计划编码列表*/
-        Set<String> batchNos = this.getBatchNosByLoginUserId();
-        if(CollectionUtils.isEmpty(batchNos)){
-            return PageResult.empty();
+        List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
+        if (CollectionUtils.isEmpty(roleIds)) {
+            return new PageResult<>(null, 0L);
         }
-        pageReqVO.setBatchNos(batchNos);
+        pageReqVO.setDeptId(SecurityFrameworkUtils.getDeptId());
+        pageReqVO.setRoleIds(new HashSet<>(roleIds));
         pageReqVO.setLocalDateTime(LocalDateTime.now());
         /*2.分页*/
         IPage<AppMaintainPlanPagePlanTypeRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
@@ -33,16 +33,15 @@
             a.finish_time as finishTime,
             a.user_id,
             a.user_name,
+            a.sort_num,
             a.remark,
             a.creator,
             a.creator_name,
             a.create_time
         FROM
-            garden_inspection_plan_commit a,
-            garden_inspection_plan b
-        where a.batch_no=b.batch_no
-        AND a.deleted = b. deleted
-          AND a.deleted = 0
+            garden_inspection_plan_commit a
+            INNER JOIN  garden_inspection_plan b ON a.batch_no = b.batch_no AND  a.deleted= b.deleted
+        where a.deleted = 0
         <if test="req.planNo != null and req.planNo !=''">
             and a.plan_no = #{req.planNo}
         </if>
@@ -125,15 +124,10 @@
             c.user_name,
             c.finish_time,
             c.remark
-        FROM
-            garden_inspection_plan a,
-            garden_inspection_plan_detail b,
-            garden_inspection_plan_commit c
-        WHERE a.batch_no = b.batch_no
-          AND b.plan_no=c.plan_no
-          AND a.dept_id =b.dept_id
-          AND a.deleted = b.deleted
-          AND a.deleted = 0
+        FROM garden_inspection_plan_detail b
+            INNER JOIN garden_inspection_plan a  ON a.batch_no = b.batch_no
+           INNER JOIN garden_inspection_plan_commit c ON c.plan_no = b.plan_no AND b.batch_no = c.batch_no
+        WHERE  a.deleted = 0
           AND b.plan_no = #{planNo}
         <if test="busiLineList != null and busiLineList.size() > 0">
             AND a.busi_line IN
@@ -141,5 +135,6 @@
                 #{id}
             </foreach>
         </if>
+        ORDER BY c.id DESC
     </select>
 </mapper>
@@ -30,14 +30,12 @@
         b.begin_time,
         b.end_time
         FROM
-        garden_inspection_plan a,
-        garden_inspection_plan_detail b
-        WHERE
-        a.batch_no = b.batch_no
-        AND a.deleted = b.deleted
-        AND a.deleted = 0
+        garden_inspection_plan a
+        INNER JOIN garden_inspection_plan_detail b ON a.batch_no = b.batch_no  AND a.deleted = b.deleted
+        WHERE a.deleted = 0
         AND a.batch_no = #{req.batchNo}
         AND a.company_id = #{req.companyId}
+        AND a.dept_id = #{req.deptId}
         <if test="req.busiLineList != null and req.busiLineList.size() > 0">
             AND a.busi_line IN
             <foreach collection="req.busiLineList" item="busiLine" open="(" separator="," close=")">
@@ -45,19 +43,26 @@
             </foreach>
         </if>
         <!--状态 1:未完成;2:已完成;3:已失效-->
-        <if test="req.finishState == 3">
-            and b.finish_state = #{req.finishState}
-            <![CDATA[and b.end_time < #{req.localDateTime}]]>
-        </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 b.begin_time <= #{req.localDateTime}
-                      and b.end_time >= #{req.localDateTime}]]>
-        </if>
-
+        <choose>
+            <when test="req.finishState == 1">
+                AND b.finish_state=1
+                <![CDATA[AND b.begin_time  <=  #{req.localDateTime}
+                         AND b.end_time  >= #{req.localDateTime}]]>
+            </when>
+            <when test="req.finishState == 2">
+                AND b.finish_state = 2
+            </when>
+            <when test="req.finishState == 3">
+                AND b.finish_state = 3
+                <![CDATA[AND b.begin_time  <=  #{req.localDateTime}
+                         AND b.end_time  >= #{req.localDateTime}]]>
+            </when>
+            <when test="req.finishState == 4">
+                AND b.finish_state = 4
+                <![CDATA[AND b.begin_time  <=  #{req.localDateTime}
+                         AND b.end_time  >= #{req.localDateTime}]]>
+            </when>
+        </choose>
     </select>
@@ -15,28 +15,34 @@
     <select id="getInspectionPlanAppPage" resultType="com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanRespVO">
         SELECT
-           a.batch_no,
-            a.road_id,
-            a.road_name,
-            a.busi_line,
-            a.plan_type_id,
-            a.level_id,
-            a.finish_state,
-            a.begin_time,
-            a.end_time
-        FROM garden_inspection_plan a JOIN -- 建议用显式JOIN代替隐式连接，可读性更高
-            garden_inspection_plan_detail b ON
-            a.batch_no = b.batch_no
-            AND a.deleted = b.deleted
-        WHERE a.deleted = 0
-          <if test="req.roadName != null and req.roadName !=''">
-            AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
-          </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>
+        b.batch_no,
+        b.plan_no,
+        a.road_id,
+        a.road_name,
+        a.busi_line,
+        a.plan_type_id,
+        a.level_id,
+        a.finish_state,
+        a.begin_time,
+        a.end_time
+        FROM
+        garden_inspection_plan_detail b
+        INNER JOIN garden_inspection_plan a ON a.batch_no = b.batch_no
+        INNER JOIN (SELECT DISTINCT batch_no
+             FROM garden_inspection_plan_role
+              WHERE deleted = 0
+              AND dept_id = #{req.deptId}
+                <if test="req.roleIds != null and req.roleIds.size() > 0">
+                    AND role_id IN
+                    <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
+                        #{roleId}
+                    </foreach>
+                </if>
+        ) c ON b.batch_no = c.batch_no
+        WHERE
+        a.deleted = 0
+        <if test="req.roadName != null and req.roadName !=''">
+            AND a.road_name LIKE CONCAT('%', #{req.roadName}, '%')
         </if>
         <if test="req.busiLineList != null and req.busiLineList.size() > 0">
             AND a.busi_line IN
@@ -44,18 +50,25 @@
                 #{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 test="req.finishState == 1">
+            AND b.finish_state = 1
+           <![CDATA[AND b.begin_time <= #{req.localDateTime}
+            AND b.end_time >= #{req.localDateTime}]]>
         </if>
         <if test="req.finishState == 2">
-            and b.finish_state = #{req.finishState}
+            AND b.finish_state = 2
         </if>
-        <if test="req.finishState == 1">
-            and b.finish_state = #{req.finishState}
-            <![CDATA[and b.end_time >= #{req.localDate}]]>
-            <![CDATA[and b.begin_time <= #{req.localDate}]]>
+        <if test="req.finishState == 3">
+            AND b.finish_state = 3
+            <![CDATA[AND b.begin_time <= #{req.localDateTime}
+            AND b.end_time >= #{req.localDateTime}]]>
+        </if>
+        <if test="req.finishState == 4">
+            AND b.finish_state = 4
+            <![CDATA[AND b.begin_time <= #{req.localDateTime}
+            AND b.end_time >= #{req.localDateTime}]]>
         </if>
+         ORDER BY b.id desc
     </select>
 </mapper>
@@ -9,7 +9,17 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
-    <select id="selectForPage" resultType="com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanCommitRespVO">
+    <resultMap id="BaseResultMap" type="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitDetailPageRespVO">
+        <result property="beginImgList" column="begin_img" typeHandler="com.zteits.urbanops.framework.mybatis.core.type.StringArrayToListTypeHandler"/>
+    </resultMap>
+
+    <resultMap id="BaseResultMapTwo" type="com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanCommitRespVO">
+        <result property="beginImgList" column="begin_img" typeHandler="com.zteits.urbanops.framework.mybatis.core.type.StringArrayToListTypeHandler"/>
+    </resultMap>
+
+
+
+    <select id="selectForPage" resultMap="BaseResultMapTwo">
         SELECT
             a.batch_no,
             a.plan_no,
@@ -28,19 +38,14 @@
             a.company_id,
             a.dept_id,
             c.finish_time,
+            c.begin_img,
             c.user_name,
-            c.finish_percent
+            c.sort_num
         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 b.batch_no = c.batch_no
-           AND a.deleted = c.deleted
-           AND a.deleted = b.deleted
-           AND a.deleted = 0
+            garden_maintain_plan_detail a
+           INNER JOIN garden_maintain_plan b ON a.batch_no = b.batch_no
+           INNER JOIN garden_maintain_plan_commit c ON a.batch_no = c.batch_no AND a.plan_no = c.plan_no
+        WHERE a.deleted = 0
         <if test="req.planNo != null and req.planNo !=''">
             and a.plan_no LIKE CONCAT('%', #{req.planNo},'%')
         </if>
@@ -71,9 +76,6 @@
         <if test="req.deptId != null">
             and a.dept_id = #{req.deptId}
         </if>
-<!--        <if test="req.roleName != null and req.roleName !=''">-->
-<!--            AND c.role_name  LIKE CONCAT(#{req.roleName},'%')-->
-<!--        </if>-->
         <if test="req.userName != null and req.userName !=''">
             AND c.user_name  LIKE CONCAT('%', #{req.userName},'%')
         </if>
@@ -89,7 +91,7 @@
         order by c.id desc
     </select>
-   <select id="appMaintainPlanCommitDetailPage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitDetailPageRespVO">
+   <select id="appMaintainPlanCommitDetailPage"  resultMap="BaseResultMap">
        SELECT
        a.batch_no,
        a.plan_no,
@@ -109,30 +111,16 @@
        a.company_id,
        a.finish_state,
        a.dept_id,
-<!--       c.finish_percent,-->
        c.begin_img,
        c.img_host,
        c.finish_time,
        c.user_name,
        c.remark
        FROM
-       garden_maintain_plan_detail a,
-       garden_maintain_plan b,
-       garden_maintain_plan_commit c
-       WHERE
-       a.batch_no = b.batch_no
-       AND a.batch_no = c.batch_no
-       AND a.plan_no = c.plan_no
-       AND c.plan_no = #{req.planNo}
+       garden_maintain_plan_detail a
+      INNER JOIN garden_maintain_plan b ON a.batch_no = b.batch_no
+      INNER JOIN  garden_maintain_plan_commit c ON a.batch_no = c.batch_no AND a.plan_no = c.plan_no
+       WHERE  a.plan_no = #{req.planNo}
+       ORDER BY c.id DESC
    </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>
@@ -23,16 +23,14 @@
         a.cycle_id,
         c.plan_num,
         c.plan_finish_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
+        garden_maintain_plan a
+        INNER JOIN garden_maintain_plan_detail c on a.batch_no=c.batch_no
+        WHERE a.deleted=0
         AND a.road_id = #{req.roadId}
         <if test="req.planName != null and req.planName !=''">
             AND a.plan_name LIKE CONCAT('%',#{req.planName},'%')
@@ -47,44 +45,49 @@
             AND a.batch_no= #{req.batchNo}
         </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>
+        <choose>
+            <when test="req.finishState == 1">
+                AND c.finish_state = 1
+                <![CDATA[AND c.begin_time  <=  #{req.localDateTime}
+                         AND c.end_time  >= #{req.localDateTime}]]>
+            </when>
+            <when test="req.finishState == 2">
+                AND c.finish_state = 2
+            </when>
+            <when test="req.finishState == 3">
+                AND c.finish_state = 3
+                <![CDATA[AND c.begin_time  <=  #{req.localDateTime}
+                         AND c.end_time  >= #{req.localDateTime}]]>
+            </when>
+            <when test="req.finishState == 4">
+                AND c.finish_state = 4
+                <![CDATA[AND c.begin_time  <=  #{req.localDateTime}
+                         AND c.end_time  >= #{req.localDateTime}]]>
+            </when>
+        </choose>
     </select>
     <select id="getMaintainNotFinishPlanCommitDetail" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailRespVO">
         SELECT
-        c.batch_no,
-        c.plan_no,
+        a.batch_no,
+        b.plan_no,
         a.plan_name,
         a.plan_type_id,
         a.rate,
         a.cycle_id,
-        c.plan_num,
-        c.plan_finish_num,
-        c.finish_state,
-        c.begin_time,
-        c.end_time,
-        c.sort_num
+        b.plan_num,
+        b.plan_finish_num,
+        b.finish_state,
+        b.begin_time,
+        b.end_time,
+        b.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}
+        garden_maintain_plan a
+        INNER JOIN garden_maintain_plan_detail b ON a.batch_no=b.batch_no
+        WHERE a.deleted=0
+        AND b.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.localDateTime}]]>
+        and b.finish_state = #{req.finishState}
     </select>
 </mapper>
@@ -16,80 +16,98 @@
     <select id="appMaintainPlanRoadPage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadRespVO">
         SELECT
         a.batch_no,
+        b.plan_no,
         a.road_id,
         a.road_name,
         a.level_id,
         a.finish_state,
         a.plan_num,
         a.plan_finish_num,
-        a.begin_time,
-        a.end_time
+        b.begin_time,
+        b.end_time
         FROM
-        garden_maintain_plan a
-        JOIN -- 建议用显式JOIN代替隐式连接，可读性更高
-        garden_maintain_plan_detail b ON a.batch_no = b.batch_no
-        AND a.deleted = b.deleted
-        WHERE a.deleted = 0
-         <if test="req.roadName != null and req.roadName !=''">
-            AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
-        </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}
+        garden_maintain_plan_detail b
+        INNER JOIN garden_maintain_plan a ON b.batch_no = a.batch_no and a.deleted = b.deleted
+        INNER JOIN (
+        SELECT DISTINCT batch_no
+        FROM garden_maintain_plan_role
+        WHERE deleted = 0
+        AND dept_id = #{req.deptId}
+        <if test="req.roleIds != null and req.roleIds.size() > 0">
+            AND role_id IN
+            <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
+                #{roleId}
             </foreach>
         </if>
+        ) c ON b.batch_no = c.batch_no
+        WHERE
+        a.deleted = 0
+        <if test="req.roadName != null and req.roadName != ''">
+            AND a.road_name LIKE CONCAT('%', #{req.roadName}, '%')
+        </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=")">
                 #{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 b.end_time >= #{req.localDate}]]>
-            <![CDATA[and b.begin_time <= #{req.localDate}]]>
-        </if>
+        <!-- 状态过滤 -->
+        <choose>
+            <when test="req.finishState == 1">
+                AND b.finish_state = 1
+                <![CDATA[AND b.begin_time  <=  #{req.localDateTime}
+                AND b.end_time  >= #{req.localDateTime}]]>
+            </when>
+            <when test="req.finishState == 2">
+                AND b.finish_state = 2
+
+            </when>
+            <when test="req.finishState == 3">
+                AND b.finish_state = 3
+                <![CDATA[AND b.begin_time  <=  #{req.localDateTime}
+                AND b.end_time  >= #{req.localDateTime}]]>
+            </when>
+            <when test="req.finishState == 4">
+                AND b.finish_state = 4
+                <![CDATA[AND b.begin_time  <=  #{req.localDateTime}
+                AND b.end_time  >= #{req.localDateTime}]]>
+            </when>
+        </choose>
+        ORDER BY b.id desc
     </select>
     <select id="appMaintainPlanPlanTypePage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO">
         SELECT
-            c.batch_no,
-            c.plan_no,
-            a.plan_name,
-            a.plan_type_id,
-            a.rate,
-            a.cycle_id,
-            c.plan_num,
-            c.plan_finish_num,
-            c.finish_state,
-            c.begin_time,
-            c.end_time
+        c.batch_no,
+        c.plan_no,
+        a.plan_name,
+        a.plan_type_id,
+        a.rate,
+        a.cycle_id,
+        c.plan_num,
+        c.plan_finish_num,
+        c.finish_state,
+        c.begin_time,
+        c.end_time
         FROM
-            garden_maintain_plan a,
-            garden_maintain_plan_detail c
-        WHERE
-            a.batch_no = c.batch_no
-        AND a.deleted=c.deleted
-          AND a.deleted=0
-          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.batchNos != null and req.batchNos.size() > 0">
-            AND a.batch_no IN
-            <foreach collection="req.batchNos" item="batchNo" open="(" separator="," close=")">
-                #{batchNo}
+        garden_maintain_plan a
+        INNER JOIN  garden_maintain_plan_detail c ON a.batch_no = c.batch_no
+        INNER JOIN (select distinct batch_no, dept_id
+        from garden_maintain_plan_role
+        where deleted = 0
+        AND dept_id = #{req.deptId}
+        <if test="req.roleIds != null and req.roleIds.size() > 0">
+            AND role_id IN
+            <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
+                #{roleId}
             </foreach>
         </if>
+        )   d ON c.batch_no = d.batch_no and c.dept_id = d.dept_id
+        AND a.deleted=0
+        AND a.plan_type_id = #{req.planTypeId}
+        <if test="req.planName != null and req.planName !=''">
+            AND a.plan_name LIKE CONCAT('%',#{req.planName},'%')
+        </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=")">
@@ -97,19 +115,26 @@
             </foreach>
         </if>
         <!--状态 1:未完成;2:已完成;3:已失效-->
-        <if test="req.finishState == 3">
-            and c.finish_state = #{req.finishState}
-            <![CDATA[and c.end_time < #{req.localDateTime}]]>
+        and c.finish_state =a.finish_state
+        <if test="req.finishState == 1">
+            and a.finish_state = 1
+            <![CDATA[and c.begin_time <= #{req.localDateTime}
+                     and c.end_time >= #{req.localDateTime}]]>
         </if>
         <if test="req.finishState == 2">
-            and c.finish_state = #{req.finishState}
+            and a.finish_state = 2
         </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 test="req.finishState == 3">
+            and a.finish_state = 3
+            <![CDATA[and c.begin_time <= #{req.localDateTime}
+                     and c.end_time >= #{req.localDateTime}]]>
+        </if>
+        <if test="req.finishState == 4">
+            and a.finish_state = 4
+            <![CDATA[and c.begin_time <= #{req.localDateTime}
+                     and c.end_time >= #{req.localDateTime}]]>
         </if>
+        ORDER BY a.id desc
     </select>
 </mapper>
@@ -133,7 +133,13 @@
         </dependency>
         <dependency>
             <groupId>com.zteits.boot</groupId>
-            <artifactId>urbanops-module-garden</artifactId>
+            <artifactId>urbanops-module-garden-api</artifactId>
+            <version>${revision}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-module-workorder-api</artifactId>
             <version>${revision}</version>
             <scope>compile</scope>
         </dependency>
 package com.zteits.urbanops.module.workorder.api.workorder;
-import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
 import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO;
+import com.zteits.urbanops.module.workorder.api.WorkOrderApi;
 import com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant;
-import com.zteits.urbanops.module.workorder.controller.app.garden.vo.AppGardenWorkOrderReqVO;
-import com.zteits.urbanops.module.workorder.controller.app.garden.vo.AppGardenWorkOrderRespVO;
 import com.zteits.urbanops.module.workorder.dal.dataobject.garden.BpmGardenWorkOrderDO;
 import com.zteits.urbanops.module.workorder.dal.mysql.maininfo.MainInfoExtMapper;
+import com.zteits.urbanops.module.workorder.dto.AdminUserRespVO;
+import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO;
+import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderRespVO;
 import com.zteits.urbanops.module.workorder.service.garden.BpmGardenService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -28,7 +29,7 @@ import static com.zteits.urbanops.framework.common.exception.util.ServiceExcepti
  * @date 2025/12/5 17:21
  */
 @Service
-public class WorkOrderApiImpl implements WorkOrderApi{
+public class WorkOrderApiImpl implements WorkOrderApi {
     @Resource
     private MainInfoExtMapper workOrderExtMapper;
@@ -57,19 +58,21 @@ public class WorkOrderApiImpl implements WorkOrderApi{
     }
     @Override
-    public List<AdminUserRespDTO> getUserByLoginIdAndRoleCode(Long loginUserId, String roleCode, String busiLine, boolean notHas) {
+    public List<AdminUserRespVO> getUserByLoginIdAndRoleCode(Long loginUserId, String roleCode, String busiLine, boolean notHas) {
         if(ObjectUtils.isEmpty(loginUserId) || ObjectUtils.isEmpty(roleCode) || ObjectUtils.isEmpty(busiLine)){
             throw exception0(BAD_REQUEST.getCode(),"param:loginUserId,roleCode,busiLine 不能为空！");
         }
-        return workOrderExtMapper.getUserByLoginIdAndRoleCode(loginUserId,roleCode,busiLine,notHas);
+        List<AdminUserRespDTO> list = workOrderExtMapper.getUserByLoginIdAndRoleCode(loginUserId, roleCode, busiLine, notHas);
+        return BeanUtils.toBean(list, AdminUserRespVO.class);
     }
     @Override
-    public List<AdminUserRespDTO> getUserByRoadIdAndRoleCode(Long roadId, String roleCode, String busiLine) {
+    public List<AdminUserRespVO> getUserByRoadIdAndRoleCode(Long roadId, String roleCode, String busiLine) {
         if(ObjectUtils.isEmpty(roadId) || ObjectUtils.isEmpty(roleCode) || ObjectUtils.isEmpty(busiLine)){
             throw exception0(BAD_REQUEST.getCode(),"param:roadId,roleCode,busiLine 不能为空！");
         }
-        return workOrderExtMapper.getUserByRoadIdAndRoleCode(roadId,roleCode,busiLine);
+        List<AdminUserRespDTO> list = workOrderExtMapper.getUserByRoadIdAndRoleCode(roadId, roleCode, busiLine);
+        return BeanUtils.toBean(list, AdminUserRespVO.class);
     }
     @Override
@@ -11,11 +11,11 @@ import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO;
 import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
 import com.zteits.urbanops.module.system.service.dept.DeptService;
 import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoPageReqVO;
-import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoRespVO;
 import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoSaveReqVO;
 import com.zteits.urbanops.module.workorder.convert.maininfo.MainInfoConvert;
 import com.zteits.urbanops.module.workorder.dal.dataobject.attachment.AttachmentDO;
 import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO;
+import com.zteits.urbanops.module.workorder.dto.MainInfoRespVO;
 import com.zteits.urbanops.module.workorder.service.attachment.AttachmentService;
 import com.zteits.urbanops.module.workorder.service.maininfo.MainInfoService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -16,6 +16,9 @@ public class MaterialDetailPageReqVO extends PageParam {
     @Schema(description = "工单号")
     private String orderNo;
+    @Schema(description = "来源 1:工单;2:园林-巡查；3:园林-养护", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private Integer source;
+
     @Schema(description = "提交用户ID", example = "10300")
     private Long userId;
@@ -20,6 +20,10 @@ public class MaterialDetailRespVO {
     @ExcelProperty("工单号")
     private String orderNo;
+    @Schema(description = "来源 1:工单;2:园林-巡查；3:园林-养护", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("来源 1:工单;2:园林-巡查；3:园林-养护")
+    private Integer source;
+
     @Schema(description = "提交用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10300")
     @ExcelProperty("提交用户ID")
     private Long userId;
@@ -16,6 +16,12 @@ public class MaterialDetailSaveReqVO {
     @NotEmpty(message = "工单号不能为空")
     private String orderNo;
+    /**
+     * 来源 1:工单;2:园林-巡查；3:园林-养护
+     */
+    @Schema(description = "来源 1:工单;2:园林-巡查；3:园林-养护", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private Integer source;
+
     @Schema(description = "种类ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27821")
     @NotNull(message = "种类ID不能为空")
     private Long classifyId;
@@ -13,11 +13,11 @@ import com.zteits.urbanops.module.bpm.framework.flowable.core.util.FlowableUtils
 import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
 import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO;
 import com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant;
-import com.zteits.urbanops.module.workorder.controller.app.garden.vo.AppGardenWorkOrderRespVO;
 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskRespVO;
 import com.zteits.urbanops.module.workorder.dal.dataobject.attachment.AttachmentDO;
 import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoExtDO;
 import com.zteits.urbanops.module.workorder.dal.mysql.attachment.AttachmentMapper;
+import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderRespVO;
 import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
@@ -4,9 +4,9 @@ import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.common.util.collection.CollectionUtils;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
 import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO;
-import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoRespVO;
 import com.zteits.urbanops.module.workorder.dal.dataobject.attachment.AttachmentDO;
 import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO;
+import com.zteits.urbanops.module.workorder.dto.MainInfoRespVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -31,6 +31,11 @@ public class MaterialDetailDO extends BaseDO {
      * 工单号
      */
     private String orderNo;
+
+    /**
+     * 来源 1:工单;2:园林-巡查；3:园林-养护
+     */
+    private Integer source;
     /**
      * 提交用户ID
      */
@@ -20,6 +20,7 @@ public interface MaterialDetailMapper extends BaseMapperX&lt;MaterialDetailDO&gt; {
     default PageResult<MaterialDetailDO> selectPage(MaterialDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<MaterialDetailDO>()
                 .eqIfPresent(MaterialDetailDO::getOrderNo, reqVO.getOrderNo())
+                .eqIfPresent(MaterialDetailDO::getSource, reqVO.getSource())
                 .eqIfPresent(MaterialDetailDO::getUserId, reqVO.getUserId())
                 .likeIfPresent(MaterialDetailDO::getUserName, reqVO.getUserName())
                 .eqIfPresent(MaterialDetailDO::getClassifyId, reqVO.getClassifyId())
@@ -3,9 +3,7 @@ package com.zteits.urbanops.module.workorder.service.materialdetail;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
 import com.zteits.urbanops.module.garden.api.material.MaterialApi;
-import com.zteits.urbanops.module.garden.api.material.dto.MaterialInventoryOutDto;
-import com.zteits.urbanops.module.garden.controller.admin.materialinventoryout.vo.MaterialInventoryOutSaveReqVO;
-import com.zteits.urbanops.module.garden.service.materialinventoryout.MaterialInventoryOutService;
+import com.zteits.urbanops.module.garden.dto.material.MaterialInventoryOutDto;
 import com.zteits.urbanops.module.workorder.controller.admin.materialdetail.vo.MaterialDetailPageReqVO;
 import com.zteits.urbanops.module.workorder.controller.admin.materialdetail.vo.MaterialDetailSaveReqVO;
 import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO;
@@ -106,6 +104,9 @@ public class MaterialDetailServiceImpl implements MaterialDetailService {
                 .map(vo -> {
                     MaterialDetailDO detailDO = new MaterialDetailDO();
                     BeanUtils.copyProperties(vo, detailDO); // 单个对象属性拷贝
+                    if(detailDO.getSource() == null){
+                        detailDO.setSource(1);
+                    }
                     detailDO.setUserId(getLoginUserId());
                     detailDO.setUserName(getLoginUserNickname());
                     return detailDO;