diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitDetailPageRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitDetailPageRespVO.java
index 02c871b..ca2f0c3 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitDetailPageRespVO.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitDetailPageRespVO.java
@@ -1,6 +1,8 @@
 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,6 +44,7 @@ public class AppMaintainPlanCommitDetailPageRespVO {
     private String imgHost;
 
     @Schema(description = "开始照片")
+    @TableField(typeHandler = StringListTypeHandler.class)
     private List<String> beginImgList;
 
     /**
diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
index 84b6326..cc69c32 100644
--- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
@@ -13,6 +13,8 @@
         <result property="beginImgList" column="begin_img" typeHandler="com.zteits.urbanops.framework.mybatis.core.type.StringArrayToListTypeHandler"/>
     </resultMap>
 
+
+
     <select id="selectForPage" resultType="com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanCommitRespVO">
         SELECT
             a.batch_no,
@@ -35,15 +37,9 @@
             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 b.batch_no = c.batch_no
-           AND a.deleted = c.deleted
-           AND a.deleted = b.deleted
-           AND a.deleted = 0
+           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>
@@ -74,9 +70,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>
@@ -92,7 +85,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,
@@ -118,13 +111,9 @@
        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}
    </select>
 </mapper>
diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml
index 2a06f81..3d514ff 100644
--- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml
@@ -65,26 +65,25 @@
 
     <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}
+        and b.finish_state = #{req.finishState}
     </select>
 </mapper>
diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
index 6962cca..121e331 100644
--- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
@@ -95,8 +95,6 @@
             </foreach>
         </if>
         )   d ON c.batch_no = d.batch_no and c.dept_id = d.dept_id
-
-        AND a.deleted=c.deleted
         AND a.deleted=0
         AND a.plan_type_id = #{req.planTypeId}
         <if test="req.planName != null and req.planName !=''">