|
|
@@ -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.get(bean.getOrderNum())){
|
|
|
+ bean.setOrderDetial(odMap.get(bean.getOrderNum()));
|
|
|
}
|
|
|
}
|
|
|
return RespDTO.onSuc(page);
|
gaodm