Merge remote-tracking branch 'origin/dev/one' into dev/one

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

@@ -39,11 +39,6 @@ public class ProductOrderWrapper{
      */
     private Integer auditStatus;
 
-    /**
-     * 订单编号
-     */
-    private String orderNum;
-
     private String username;// 用户名
 
     private String linkman;//联系人

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

@@ -23,6 +23,7 @@ import com.diagbot.idc.VisibleIdCreater;
 import com.diagbot.service.impl.ProductOrderServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ExportBeanExcelUtil;
 import com.diagbot.util.GsonUtil;
 import com.diagbot.util.UserUtils;
@@ -215,6 +216,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 					"获取用户和机构信息失败");
 		}
 		Map<Long, UserOrgDTO> dataMap = mapRespDTO.data;
+		Map<String,List<OrderDetailsWapper>> odMap = EntityUtil.makeEntityListMap(orderDetilList,"orderNum");
 		for(ProductOrderWrapper bean : list) {
 			UserOrgDTO uo = dataMap.get(bean.getUserId());
 			if(uo != null) {
@@ -224,10 +226,8 @@ 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);
-                }
+			if (null != odMap && null != odMap.get(bean.getNum())){
+                bean.setOrderDetial(odMap.get(bean.getNum()));
             }
 		}
 		return RespDTO.onSuc(page);

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

@@ -141,7 +141,8 @@ public class ProductOrderController {
                     "userId:用户id<br>" +
                     "time:下单时间<br>" +
                     "linkman:用户名称<br>" +
-                    "username:手机号码<br>")
+                    "username:手机号码<br>" +
+                    "orderDetial:订单审核信息<br>")
     @PostMapping("/getAllProductOrder")
     @SysLogger("getAllProductOrder")
     public RespDTO<IPage<ProductOrderWrapper>> getAllProductOrder(@RequestBody ProductOrderVO productOrderVO) {