From 7207e75881349b2a4c8abbb67b27c4a07381f4c3 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 14 七月 2020 19:09:54 +0800
Subject: [PATCH] 优化采购申请功能
---
service-store/src/main/java/com/java110/store/smo/impl/PurchaseApplyInnerServiceSMOImpl.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/smo/impl/PurchaseApplyInnerServiceSMOImpl.java b/service-store/src/main/java/com/java110/store/smo/impl/PurchaseApplyInnerServiceSMOImpl.java
index c4b118b..f18869e 100644
--- a/service-store/src/main/java/com/java110/store/smo/impl/PurchaseApplyInnerServiceSMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/smo/impl/PurchaseApplyInnerServiceSMOImpl.java
@@ -10,15 +10,17 @@
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.purchase.PurchaseApplyDetailPo;
import com.java110.po.purchase.PurchaseApplyPo;
-import com.java110.po.purchase.ResourceStorePo;
import com.java110.store.dao.IPurchaseApplyServiceDao;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.api.purchaseApply.PurchaseApplyDetailVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @ClassName FloorInnerServiceSMOImpl
@@ -95,11 +97,14 @@
purchaseApplyDto.setPage((page - 1) * purchaseApplyDto.getRow());
}
- List<PurchaseApplyDto> purchaseApplys = purchaseApplyServiceDaoImpl.getPurchaseApplyInfo2(BeanConvertUtil.beanCovertMap(purchaseApplyDto));
+ List<PurchaseApplyDto> purchaseApplys = BeanConvertUtil.covertBeanList(
+ purchaseApplyServiceDaoImpl.getPurchaseApplyInfo(BeanConvertUtil.beanCovertMap(purchaseApplyDto)), PurchaseApplyDto.class);
if (purchaseApplys == null || purchaseApplys.size() == 0) {
return purchaseApplys;
}
+
+ freshPurchaseApplyDetail(purchaseApplys);
String[] userIds = getUserIds(purchaseApplys);
//鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
@@ -111,6 +116,38 @@
return purchaseApplys;
}
+ private void freshPurchaseApplyDetail(List<PurchaseApplyDto> purchaseApplys) {
+
+ List<String> applyOrderIds = new ArrayList<String>();
+ for (PurchaseApplyDto purchaseApplyDto : purchaseApplys) {
+ applyOrderIds.add(purchaseApplyDto.getApplyOrderId());
+ }
+
+ if (applyOrderIds.size() < 1) {
+ return;
+ }
+
+ String[] tmpApplyOrderIds = applyOrderIds.toArray(new String[applyOrderIds.size()]);
+
+ Map info = new HashMap<>();
+ info.put("applyOrderIds", tmpApplyOrderIds);
+ List<Map> details = purchaseApplyServiceDaoImpl.getPurchaseApplyDetailInfo(info);
+
+ List<PurchaseApplyDetailDto> purchaseApplyDetailDtos = BeanConvertUtil.covertBeanList(details, PurchaseApplyDetailDto.class);
+
+ List<PurchaseApplyDetailDto> purchaseApplyDetailDtoList = null;
+ for (PurchaseApplyDto purchaseApplyDto : purchaseApplys) {
+ purchaseApplyDetailDtoList = new ArrayList<>();
+ for (PurchaseApplyDetailDto purchaseApplyDetailDto : purchaseApplyDetailDtos) {
+ if (purchaseApplyDto.getApplyOrderId().equals(purchaseApplyDetailDto.getApplyOrderId())) {
+ purchaseApplyDetailDtoList.add(purchaseApplyDetailDto);
+ }
+ }
+ purchaseApplyDto.setPurchaseApplyDetailVo(BeanConvertUtil.covertBeanList(purchaseApplyDetailDtoList, PurchaseApplyDetailVo.class));
+ }
+
+ }
+
/**
* 浠庣敤鎴峰垪琛ㄤ腑鏌ヨ鐢ㄦ埛锛屽皢鐢ㄦ埛涓殑淇℃伅 鍒锋柊鍒� floor瀵硅薄涓�
--
Gitblit v1.8.0