开通产品进度修改

diagbotman-service/src/main/java/com/diagbot/dto/ProductAuthProgressDTO.java

@@ -20,14 +20,24 @@ public class ProductAuthProgressDTO implements Serializable {
      */
     private static final long serialVersionUID = 1L;
 
+//    /**
+//     * 订单编号
+//     */
+//    private String num;
+//
+//    /**
+//     * 订单详情
+//     */
+//    private List<AuthDetailDTO> products;
+    
     /**
-     * 订单编号
+     * 待审核和审核通过的订单明细
      */
-    private String num;
-
+    private List<AuthDetailDTO> passProduct;
+    
     /**
-     * 订单详情
+     * 审核不通过的订单明细
      */
-    private List<AuthDetailDTO> products;
+    private List<AuthDetailDTO> failProduct;
 
 }

diagbotman-service/src/main/java/com/diagbot/facade/ProductOrderFacade.java

@@ -76,37 +76,55 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
      *
      * @return 包含产品当前的认证状态
      */
-    public List<ProductAuthProgressDTO> productAuthProgress() {
-        List<ProductAuthProgressDTO> retList = new ArrayList<ProductAuthProgressDTO>();
-        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
-        List<ProductOrder> orderList = baseMapper.getUserProductOrder(userId);
-        List<String> nums = new ArrayList<>();
-        for (ProductOrder i : orderList) {
-            nums.add(i.getNum());
-        }
-        
-        if(nums.size()==0){
-        	return retList;
-        }
+    public ProductAuthProgressDTO productAuthProgress() {
+//        List<ProductAuthProgressDTO> retList = new ArrayList<ProductAuthProgressDTO>();
+//        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+//        List<ProductOrder> orderList = baseMapper.getUserProductOrder(userId);
+//        List<String> nums = new ArrayList<>();
+//        for (ProductOrder i : orderList) {
+//            nums.add(i.getNum());
+//        }
+//        
+//        if(nums.size()==0){
+//        	return retList;
+//        }
         
-        List<AuthDetailDTO> detailList = baseMapper.getOrderDetailsByNums(nums);
-        List<AuthDetailDTO> products = null;
-        Map<String, List<AuthDetailDTO>> detailMap = detailList.stream().collect(Collectors.groupingBy(AuthDetailDTO::getNum));
-        for (String num : detailMap.keySet()) {
-            ProductAuthProgressDTO productAuthProgressDTO = new ProductAuthProgressDTO();
-            productAuthProgressDTO.setNum(num);
-            products = detailMap.get(num);
-            for(AuthDetailDTO i : products){
-            	i.setAuditStatusMsg(AuditStatusEnum.getName(i.getAuditStatus()));
-            	if(i.getRejectType()!=null&&i.getRejectType()!=-1){
-            		i.setRejectReason(NotPassEnum.getName(i.getRejectType()));
-            	}
-            }
-            productAuthProgressDTO.setProducts(products);
-            retList.add(productAuthProgressDTO);
+//        List<AuthDetailDTO> detailList = baseMapper.getOrderDetailsByNums(nums);
+//        List<AuthDetailDTO> products = null;
+//        Map<String, List<AuthDetailDTO>> detailMap = detailList.stream().collect(Collectors.groupingBy(AuthDetailDTO::getNum));
+//        for (String num : detailMap.keySet()) {
+//            ProductAuthProgressDTO productAuthProgressDTO = new ProductAuthProgressDTO();
+//            productAuthProgressDTO.setNum(num);
+//            products = detailMap.get(num);
+//            for(AuthDetailDTO i : products){
+//            	i.setAuditStatusMsg(AuditStatusEnum.getName(i.getAuditStatus()));
+//            	if(i.getRejectType()!=null&&i.getRejectType()!=-1){
+//            		i.setRejectReason(NotPassEnum.getName(i.getRejectType()));
+//            	}
+//            }
+//            productAuthProgressDTO.setProducts(products);
+//            retList.add(productAuthProgressDTO);
+//        }
+        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        List<AuthDetailDTO> detailList = baseMapper.getOrderDetailsByUserId(userId);
+        List<AuthDetailDTO> passProduct = new ArrayList<>();
+        List<AuthDetailDTO> failProduct = new ArrayList<>();
+        for(AuthDetailDTO i : detailList){
+        	i.setAuditStatusMsg(AuditStatusEnum.getName(i.getAuditStatus()));
+        	if(i.getRejectType()!=null&&i.getRejectType()!=-1){
+        		i.setRejectReason(NotPassEnum.getName(i.getRejectType()));
+        	}
+        	if(i.getAuditStatus()==0){
+        		failProduct.add(i);
+        	}else{
+        		passProduct.add(i);
+        	}
         }
 
-        return retList;
+        ProductAuthProgressDTO productAuthProgressDTO = new ProductAuthProgressDTO();
+        productAuthProgressDTO.setPassProduct(passProduct);
+        productAuthProgressDTO.setFailProduct(failProduct);
+        return productAuthProgressDTO;
     }
     
     /**

diagbotman-service/src/main/java/com/diagbot/mapper/ProductOrderMapper.java

@@ -50,6 +50,13 @@ public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
      */
     List<AuthDetailDTO> getOrderDetailsByNums(List<String> nums);
     
+    /**
+     * 根据用户id查询详情集合
+     * @param userId
+     * @return
+     */
+    List<AuthDetailDTO> getOrderDetailsByUserId(Long userId);
+    
     /**
      * 根据用户id查询审核不通过订单信息数量
      * @param userId

diagbotman-service/src/main/java/com/diagbot/web/ProductOrderController.java

@@ -61,7 +61,7 @@ public class ProductOrderController {
     @ApiOperation(value = "控制台-产品认证进度[by:rengb]", notes = "控制台-产品认证进度")
     @PostMapping("/productAuthProgress")
     @SysLogger("productAuthProgress")
-    public RespDTO<List<ProductAuthProgressDTO>> productAuthProgress() {
+    public RespDTO<ProductAuthProgressDTO> productAuthProgress() {
         return RespDTO.onSuc(productOrderFacade.productAuthProgress());
     }
 

diagbotman-service/src/main/resources/mapper/ProductOrderMapper.xml

@@ -68,6 +68,22 @@
         <foreach collection="list" separator="," open="(" close=")" item="num">
             #{num}
         </foreach>
+        order by b.audit_status desc,b.gmt_modified desc,b.gmt_create desc
+    </select>
+    
+   	<select id="getOrderDetailsByUserId" parameterType="Long" 
+   			resultType="com.diagbot.dto.AuthDetailDTO">
+    	select
+        b.order_num as num,
+        b.audit_status as auditStatus,
+        c.name as name,
+		b.reject_type as rejectType,
+        b.reject_reason as rejectReason
+		from diag_product_order a
+		join diag_order_details b on a.num=b.order_num
+		join diag_lantone_product c on b.product_id=c.id
+		where a.is_deleted = 'N' and b.is_deleted = 'N' and c.is_deleted = 'N' and a.user_id=#{userId}
+		order by b.audit_status desc,b.gmt_modified desc,b.gmt_create desc
     </select>
     
     <select id="getOrderAuthFailCount" parameterType="Long" resultType="int">