返修

src/main/java/com/izouma/awesomeadmin/dao/OrderImageMapper.xml

@@ -249,6 +249,9 @@
         from order_image
         <where>
             and del_flag = 'N'
+            <if test="record.baseRepairId != null and !&quot;&quot;.equals(record.baseRepairId)">
+                and  id in ( SELECT image_id FROM order_repair_detail WHERE repair_id = #{record.baseRepairId})
+            </if>
             <if test="record.id != null and !&quot;&quot;.equals(record.id)">
                 and id = #{record.id}
             </if>

src/main/java/com/izouma/awesomeadmin/model/OrderImage.java

@@ -42,10 +42,15 @@ public class OrderImage {
     private String detailRemark;
 
     /**
-     * 返修ID
+     * 目标返修ID
      */
     private String repairId;
 
+    /**
+     * 基础返修ID
+     */
+    private String baseRepairId;
+
     private String searchKey;
 
     /**
@@ -233,5 +238,13 @@ public class OrderImage {
     public void setRepairId(String repairId) {
         this.repairId = repairId;
     }
+
+    public String getBaseRepairId() {
+        return baseRepairId;
+    }
+
+    public void setBaseRepairId(String baseRepairId) {
+        this.baseRepairId = baseRepairId;
+    }
 }