20190621 审核图片

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

@@ -747,6 +747,14 @@
         where
         del_flag = 'N'
         and order_id = #{orderId}
+        AND status_flag = 2
+        ) as fail_num,
+        (select
+        COUNT(1) AS total_num
+        from order_album
+        where
+        del_flag = 'N'
+        and order_id = #{orderId}
         <if test="baseRepairId != null and !&quot;&quot;.equals(baseRepairId)">
             and id in ( SELECT image_id FROM order_album_repair_detail WHERE repair_id = #{baseRepairId})
         </if>

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

@@ -866,6 +866,14 @@
         where
         del_flag = 'N'
         and order_id = #{orderId}
+        AND status_flag = 2
+        ) as fail_num,
+        (select
+        COUNT(1) AS total_num
+        from order_image
+        where
+        del_flag = 'N'
+        and order_id = #{orderId}
         <if test="baseRepairId != null and !&quot;&quot;.equals(baseRepairId)">
             and id in ( SELECT image_id FROM order_repair_detail WHERE repair_id = #{baseRepairId})
         </if>

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

@@ -81,6 +81,8 @@ public class OrderAlbum {
 
     private Integer needNum;
 
+    private Integer failNum;
+
     public Integer getId() {
         return this.id;
     }
@@ -320,5 +322,13 @@ public class OrderAlbum {
     public void setNeedNum(Integer needNum) {
         this.needNum = needNum;
     }
+
+    public Integer getFailNum() {
+        return failNum;
+    }
+
+    public void setFailNum(Integer failNum) {
+        this.failNum = failNum;
+    }
 }
 

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

@@ -139,6 +139,8 @@ public class OrderImage {
      */
     private Integer needNum;
 
+    private Integer failNum;
+
     public Integer getId() {
         return this.id;
     }
@@ -475,5 +477,13 @@ public class OrderImage {
     public void setNeedNum(Integer needNum) {
         this.needNum = needNum;
     }
+
+    public Integer getFailNum() {
+        return failNum;
+    }
+
+    public void setFailNum(Integer failNum) {
+        this.failNum = failNum;
+    }
 }
 

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

@@ -177,6 +177,10 @@ public class UserOrder {
      */
     private Integer needAlbum;
 
+    private Integer failAlbum;
+
+    private Integer failImage;
+
 
     public Integer getId() {
         return this.id;
@@ -705,5 +709,21 @@ public class UserOrder {
     public void setNeedAlbum(Integer needAlbum) {
         this.needAlbum = needAlbum;
     }
+
+    public Integer getFailAlbum() {
+        return failAlbum;
+    }
+
+    public void setFailAlbum(Integer failAlbum) {
+        this.failAlbum = failAlbum;
+    }
+
+    public Integer getFailImage() {
+        return failImage;
+    }
+
+    public void setFailImage(Integer failImage) {
+        this.failImage = failImage;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/impl/UserOrderServiceImpl.java

@@ -1541,6 +1541,7 @@ public class UserOrderServiceImpl implements UserOrderService {
                 if (orderImage != null) {
                     resultOrder.setTotalImage(orderImage.getTotalNum());
                     resultOrder.setNeedImage(orderImage.getNeedNum());
+                    resultOrder.setFailImage(orderImage.getFailNum());
                 }
 
                 OrderAlbum orderAlbum = new OrderAlbum();
@@ -1552,6 +1553,7 @@ public class UserOrderServiceImpl implements UserOrderService {
                 if (orderAlbum != null) {
                     resultOrder.setTotalAlbum(orderAlbum.getTotalNum());
                     resultOrder.setNeedAlbum(orderAlbum.getNeedNum());
+                    resultOrder.setFailAlbum(orderAlbum.getFailNum());
                 }