From 22e8a676ee42c0d78b3526bcd9a635abbe8dca03 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 28 六月 2022 11:28:21 +0800
Subject: [PATCH] 优化databus bug

---
 service-store/src/main/java/com/java110/store/smo/impl/PurchaseApplyInnerServiceSMOImpl.java |   75 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 73 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
old mode 100644
new mode 100755
index c4b118b..54cabbf
--- 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 鏌ヨ鐢ㄦ埛淇℃伅
@@ -109,6 +114,38 @@
             refreshPurchaseApply(purchaseApply, users);
         }
         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));
+        }
+
     }
 
 
@@ -153,6 +190,40 @@
         return purchaseApplyDetails;
     }
 
+    @Override
+    public void updatePurchaseApply(@RequestBody PurchaseApplyPo purchaseApplyPo) {
+        purchaseApplyServiceDaoImpl.updatePurchaseApplyInfoInstance(BeanConvertUtil.beanCovertMap(purchaseApplyPo));
+    }
+
+    /**
+     * 鑾峰彇涓嬬骇澶勭悊浜篿d
+     *
+     * @param purchaseApplyDto
+     * @return
+     */
+    @Override
+    public List<PurchaseApplyDto> getActRuTaskUserId(@RequestBody PurchaseApplyDto purchaseApplyDto) {
+        List<PurchaseApplyDto> purchaseApplys = BeanConvertUtil.covertBeanList(purchaseApplyServiceDaoImpl.getActRuTaskUserId(BeanConvertUtil.beanCovertMap(purchaseApplyDto)), PurchaseApplyDto.class);
+        return purchaseApplys;
+    }
+
+    /**
+     * 鑾峰彇娴佺▼浠诲姟id
+     *
+     * @param purchaseApplyDto
+     * @return
+     */
+    @Override
+    public List<PurchaseApplyDto> getActRuTaskId(@RequestBody PurchaseApplyDto purchaseApplyDto) {
+        List<PurchaseApplyDto> purchaseApplys = BeanConvertUtil.covertBeanList(purchaseApplyServiceDaoImpl.getActRuTaskId(BeanConvertUtil.beanCovertMap(purchaseApplyDto)), PurchaseApplyDto.class);
+        return purchaseApplys;
+    }
+
+    @Override
+    public void updateActRuTaskById(@RequestBody PurchaseApplyDto purchaseApplyDto) {
+        purchaseApplyServiceDaoImpl.updateActRuTaskById(BeanConvertUtil.beanCovertMap(purchaseApplyDto));
+    }
+
 
     public IPurchaseApplyServiceDao getPurchaseApplyServiceDaoImpl() {
         return purchaseApplyServiceDaoImpl;

--
Gitblit v1.8.0