优化

王富生
1 parent 4c567386
Showing 3 changed files with 17 additions and 4 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
 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.*;
@@ -71,6 +74,11 @@ public class MaintainPlanCommitRespVO {
     @ExcelProperty("完成次数")
     private Integer planFinishNum;
+    @Schema(description = "照片")
+    @ExcelProperty("照片")
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> beginImgList;
+
     @Schema(description = "完成时间")
     @ExcelProperty("完成时间")
     private LocalDateTime finishTime;
@@ -125,7 +125,7 @@
             c.remark
         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 = a.plan_no AND b.batch_no = c.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">
@@ -134,6 +134,6 @@
                 #{id}
             </foreach>
         </if>
-        ODER BY c.id DESC
+        ORDER BY c.id DESC
     </select>
 </mapper>
@@ -13,9 +13,13 @@
         <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" resultType="com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanCommitRespVO">
+    <select id="selectForPage" resultMap="BaseResultMapTwo">
         SELECT
             a.batch_no,
             a.plan_no,
@@ -34,9 +38,10 @@
             a.company_id,
             a.dept_id,
             c.finish_time,
+            c.begin_img,
             c.user_name
         FROM
-            garden_maintain_plan_detail a,
+            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