20190621 审核图片

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

@@ -35,5 +35,7 @@ public interface OrderAlbumMapper{
     int passBatch(OrderAlbum record);
 
     OrderAlbum checkAlbumNum(OrderAlbum record);
+
+    OrderAlbum checkRepairAlbumNum(OrderAlbum orderAlbum);
 }
 

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

@@ -731,6 +731,27 @@
         </if>
         ) as total_num
     </select>
+    <select id="checkRepairAlbumNum" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.OrderAlbum">
+        SELECT (select
+        COUNT(1) AS total_num
+        from order_album
+        where
+        del_flag = 'N'
+        and order_id = #{orderId}
+        AND status_flag = 0
+        ) as need_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>
+        ) as total_num
+    </select>
 
 
     <update id="passBatch" parameterType="com.izouma.awesomeadmin.model.OrderAlbum">

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

@@ -42,5 +42,7 @@ public interface OrderImageMapper {
     int passBatch(OrderImage record);
 
     OrderImage checkImageNum(OrderImage record);
+
+    OrderImage checkRepairImageNum(OrderImage record);
 }
 

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

@@ -849,6 +849,28 @@
         </if>
         ) as total_num
 
+    </select>
+    <select id="checkRepairImageNum" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.OrderImage">
+        SELECT (select
+        COUNT(1) AS total_num
+        from order_image
+        where
+        del_flag = 'N'
+        and order_id = #{orderId}
+        AND status_flag = 0
+        ) as need_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>
+        ) as total_num
+
     </select>
     <select id="getMemorySize" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderImage">
         SELECT

src/main/java/com/izouma/awesomeadmin/service/OrderImageService.java

@@ -53,5 +53,7 @@ public interface OrderImageService {
     void testAsync(int testNum);
 
     OrderImage checkImageNum(String orderId, String repairId);
+
+    OrderImage checkRepairImageNum(String orderId, String repairId);
 }
 

src/main/java/com/izouma/awesomeadmin/service/UserOrderService.java

@@ -103,5 +103,7 @@ public interface UserOrderService {
     Result autoAccept();
 
     Result checkImageAndAlbum(String orderId, String repairId, String albumRepairId);
+
+    Result checkRepairImageAndAlbum(String orderId, String repairId, String albumRepairId);
 }
 

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

@@ -706,7 +706,25 @@ public class OrderImageServiceImpl implements OrderImageService {
             return orderImageMapper.checkImageNum(record);
 
         } catch (Exception e) {
-            logger.error("getMemorySize", e);
+            logger.error("checkImageNum", e);
+        }
+
+        return null;
+
+    }
+    @Override
+    public OrderImage checkRepairImageNum(String orderId, String repairId) {
+        logger.info("checkRepairImageNum");
+        try {
+
+            OrderImage record = new OrderImage();
+            record.setOrderId(orderId);
+            record.setBaseRepairId(repairId);
+
+            return orderImageMapper.checkRepairImageNum(record);
+
+        } catch (Exception e) {
+            logger.error("checkRepairImageNum", e);
         }
 
         return null;

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

@@ -1523,6 +1523,48 @@ public class UserOrderServiceImpl implements UserOrderService {
         return new Result(false, "checkImageAndAlbum失败");
     }
 
+    @Override
+    public Result checkRepairImageAndAlbum(String orderId, String repairId, String albumRepairId) {
+
+        logger.info("checkRepairImageAndAlbum：检测数量");
+        try {
+            UserOrder resultOrder = new UserOrder();
+
+            UserOrder userOrder = new UserOrder();
+            userOrder.setId(Integer.valueOf(orderId));
+            userOrder = userOrderMapper.querySingleUserOrder(userOrder);
+            if (userOrder != null) {
+
+
+                OrderImage orderImage = orderImageService.checkRepairImageNum(orderId, repairId);
+
+                if (orderImage != null) {
+                    resultOrder.setTotalImage(orderImage.getTotalNum());
+                    resultOrder.setNeedImage(orderImage.getNeedNum());
+                }
+
+                OrderAlbum orderAlbum = new OrderAlbum();
+                orderAlbum.setOrderId(orderId);
+                orderAlbum.setBaseRepairId(albumRepairId);
+
+                orderAlbum = orderAlbumMapper.checkRepairAlbumNum(orderAlbum);
+
+                if (orderAlbum != null) {
+                    resultOrder.setTotalAlbum(orderAlbum.getTotalNum());
+                    resultOrder.setNeedAlbum(orderAlbum.getNeedNum());
+                }
+
+
+            }
+
+            return new Result(true, resultOrder);
+
+        } catch (Exception e) {
+            logger.error("checkRepairImageAndAlbum异常", e);
+        }
+        return new Result(false, "checkRepairImageAndAlbum失败");
+    }
+
 
 }
 

src/main/java/com/izouma/awesomeadmin/web/UserOrderController.java

@@ -400,6 +400,15 @@ public class UserOrderController {
 
     }
 
+    @RequestMapping(value = "/checkRepairImageAndAlbum", method = RequestMethod.GET)
+    @ResponseBody
+    public Result checkRepairImageAndAlbum(@RequestParam(required = true, value = "orderId") String orderId, @RequestParam(required = false, value = "repairId") String repairId,
+                                           @RequestParam(required = false, value = "albumRepairId") String albumRepairId) {
+
+        return userOrderService.checkRepairImageAndAlbum(orderId);
+
+    }
+
 
 }