将订单审核查看和订单显示接口合并

diagbotman-service/src/main/java/com/diagbot/entity/OrderDetailsIndex.java

@@ -4,6 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -27,7 +28,7 @@ public class OrderDetailsIndex implements Serializable {
     /**
      * 订单编号
      */
-    private String orderNum;
+    private List<String> orderNum;
 
     /**
      * 产品id

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/OrderDetailsWapper.java

@@ -48,6 +48,11 @@ public class OrderDetailsWapper {
      */
     private String productName;
 
+    /**
+     * 订单编号
+     */
+    private String orderNum;
+
     private Date startTime;//开始时间
 
     private Date endTime;//结束时间

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/ProductOrderWrapper.java

@@ -4,6 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description:
@@ -38,6 +39,11 @@ public class ProductOrderWrapper{
      */
     private Integer auditStatus;
 
+    /**
+     * 订单编号
+     */
+    private String orderNum;
+
     private String username;// 用户名
 
     private String linkman;//联系人
@@ -47,4 +53,6 @@ public class ProductOrderWrapper{
     private Long orgId;//机构ID
 
     private String orgName;//机构名称
+
+    private List<OrderDetailsWapper> orderDetial;//订单明细
 }

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

@@ -13,6 +13,7 @@ import com.diagbot.entity.OrderDetailStatus;
 import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ProductOrderIndex;
+import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.entity.wrapper.ProductOrderWrapper;
 import com.diagbot.enums.AuditStatusEnum;
 import com.diagbot.enums.VisibleIdTypeEnum;
@@ -26,6 +27,7 @@ import com.diagbot.util.ExportBeanExcelUtil;
 import com.diagbot.util.GsonUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddOrderVO;
+import com.diagbot.vo.OrderDetialsVO;
 import com.diagbot.vo.ProductOrderExportVO;
 import com.diagbot.vo.ProductOrderVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -197,10 +199,16 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
         }
 		List<ProductOrderWrapper> list =productOrderFacade.selectAllProductOrder(page,productOrderIndex).getRecords();
 		List<Long> list1 =new ArrayList<>();
+		List<String> orderNoList =new ArrayList<>();
 		for (ProductOrderWrapper productOrderWrapper:list) {
 			Long longs = productOrderWrapper.getUserId();
+			String orderNo =productOrderWrapper.getNum();
 			list1.add(longs);
+			orderNoList.add(orderNo);
 		}
+        OrderDetialsVO orderDetialsVO =new OrderDetialsVO();
+		orderDetialsVO.setOrderNum(orderNoList);
+		List<OrderDetailsWapper> orderDetilList = orderDetailsFacade.getAllOrderDetials(orderDetialsVO);
 		RespDTO<Map<Long, UserOrgDTO>> mapRespDTO = userServiceClient.getUserAndOrg(list1);
 		if(mapRespDTO == null || !"0".equals(mapRespDTO.code) ) {
 			throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
@@ -216,6 +224,11 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 				bean.setOrgId(uo.getOrgId());
 				bean.setOrgName(uo.getOrgName());
 			}
+			for(int i = 0; i<orderDetilList.size();i++){
+			    if(orderDetilList.get(i).getOrderNum().equals(bean.getNum())){
+                    bean.setOrderDetial(orderDetilList);
+                }
+            }
 		}
 		return RespDTO.onSuc(page);
 	}

diagbotman-service/src/main/java/com/diagbot/vo/OrderDetialsVO.java

@@ -3,6 +3,8 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * @Description:
  * @author: wangyu
@@ -14,5 +16,5 @@ public class OrderDetialsVO {
     /**
      * 订单编号
      */
-    private String orderNum;
+    private List<String> orderNum;
 }

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

@@ -38,17 +38,18 @@
         <result column="reject_reason" property="rejectReason"/>
         <result column="order_time" property="orderTime"/>
     </resultMap>
-    <select id="seleAllOrderDetials" resultMap="BaseResultWrapper"
-            parameterType="com.diagbot.entity.wrapper.OrderDetailsWapper">
+    <select id="seleAllOrderDetials" resultMap="BaseResultWrapper">
         SELECT
-        a.id,a.user_id,a.audit_status,a.`status`,a.reject_type,a.reject_reason , b.time order_time,c.`name` product_name
+        a.id,a.user_id,a.audit_status,a.`status`,a.reject_type,a.reject_reason , b.time order_time,c.`name` product_name,a.order_num
         FROM
         diag_order_details a
         LEFT JOIN diag_product_order b ON a.order_num = b.num
         LEFT JOIN diag_lantone_product c ON a.product_id =c.id
         WHERE a.is_deleted = 'N'
-        <if test="orderNum != null and orderNum !=''">
-            AND a.order_num = #{orderNum}
+        <if test="orderNum != null and orderNum.size > 0">
+            <foreach item="orderNum" collection="orderNum" open="and(" separator="or" close=")" >
+                a.order_num = #{orderNum}
+            </foreach>
         </if>
         <if test="productId != null and productId !=''">
             AND product_id = #{productId}