From df3192f4e98377526d098928a9910c03e836c630 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期五, 06 八月 2021 22:02:36 +0800
Subject: [PATCH] 优化戴拿

---
 service-fee/src/main/java/com/java110/fee/smo/impl/TempCarFeeConfigInnerServiceSMOImpl.java |   40 +++++++++++++++++++++++++++++++++-------
 1 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/smo/impl/TempCarFeeConfigInnerServiceSMOImpl.java b/service-fee/src/main/java/com/java110/fee/smo/impl/TempCarFeeConfigInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index 0bf72b3..665ac09
--- a/service-fee/src/main/java/com/java110/fee/smo/impl/TempCarFeeConfigInnerServiceSMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/smo/impl/TempCarFeeConfigInnerServiceSMOImpl.java
@@ -3,11 +3,12 @@
 
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
+import com.java110.dto.tempCarFeeConfig.TempCarFeeConfigAttrDto;
 import com.java110.dto.tempCarFeeConfig.TempCarFeeConfigDto;
 import com.java110.dto.tempCarFeeConfig.TempCarFeeRuleDto;
 import com.java110.dto.tempCarFeeConfig.TempCarFeeRuleSpecDto;
-import com.java110.dto.user.UserDto;
 import com.java110.fee.dao.ITempCarFeeConfigServiceDao;
+import com.java110.intf.fee.ITempCarFeeConfigAttrInnerServiceSMO;
 import com.java110.intf.fee.ITempCarFeeConfigInnerServiceSMO;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,9 @@
     @Autowired
     private ITempCarFeeConfigServiceDao tempCarFeeConfigServiceDaoImpl;
 
+    @Autowired
+    private ITempCarFeeConfigAttrInnerServiceSMO tempCarFeeConfigAttrInnerServiceSMOImpl;
+
 
     @Override
     public List<TempCarFeeConfigDto> queryTempCarFeeConfigs(@RequestBody TempCarFeeConfigDto tempCarFeeConfigDto) {
@@ -45,20 +49,42 @@
 
         List<TempCarFeeConfigDto> tempCarFeeConfigs = BeanConvertUtil.covertBeanList(tempCarFeeConfigServiceDaoImpl.getTempCarFeeConfigInfo(BeanConvertUtil.beanCovertMap(tempCarFeeConfigDto)), TempCarFeeConfigDto.class);
 
+        refreshTempCarFeeConfig(tempCarFeeConfigs);
+
         return tempCarFeeConfigs;
     }
 
     /**
      * 浠庣敤鎴峰垪琛ㄤ腑鏌ヨ鐢ㄦ埛锛屽皢鐢ㄦ埛涓殑淇℃伅 鍒锋柊鍒� floor瀵硅薄涓�
      *
-     * @param tempCarFeeConfig 灏忓尯涓存椂杞︽敹璐规爣鍑嗕俊鎭�
-     * @param users            鐢ㄦ埛鍒楄〃
+     * @param tempCarFeeConfigs 灏忓尯涓存椂杞︽敹璐规爣鍑嗕俊鎭�
      */
-    private void refreshTempCarFeeConfig(TempCarFeeConfigDto tempCarFeeConfig, List<UserDto> users) {
-        for (UserDto user : users) {
-            if (tempCarFeeConfig.getConfigId().equals(user.getUserId())) {
-                BeanConvertUtil.covertBean(user, tempCarFeeConfig);
+    private void refreshTempCarFeeConfig(List<TempCarFeeConfigDto> tempCarFeeConfigs) {
+        if (tempCarFeeConfigs == null || tempCarFeeConfigs.size() < 1) {
+            return;
+        }
+        List<String> configIds = new ArrayList<>();
+        for (TempCarFeeConfigDto tempCarFeeConfigDto : tempCarFeeConfigs) {
+            configIds.add(tempCarFeeConfigDto.getConfigId());
+        }
+
+        TempCarFeeConfigAttrDto tempCarFeeConfigAttrDto = new TempCarFeeConfigAttrDto();
+        tempCarFeeConfigAttrDto.setConfigIds(configIds.toArray(new String[configIds.size()]));
+        tempCarFeeConfigAttrDto.setCommunityId(tempCarFeeConfigs.get(0).getCommunityId());
+        List<TempCarFeeConfigAttrDto> tempCarFeeConfigAttrDtos = tempCarFeeConfigAttrInnerServiceSMOImpl.queryTempCarFeeConfigAttrs(tempCarFeeConfigAttrDto);
+
+        if (tempCarFeeConfigAttrDtos == null || tempCarFeeConfigAttrDtos.size() < 1) {
+            return;
+        }
+        List<TempCarFeeConfigAttrDto> tempCarFeeConfigAttrDtoList = null;
+        for (TempCarFeeConfigDto tempCarFeeConfigDto : tempCarFeeConfigs) {
+            tempCarFeeConfigAttrDtoList = new ArrayList<>();
+            for (TempCarFeeConfigAttrDto tCarFeeConfigAttrDto : tempCarFeeConfigAttrDtos) {
+                if (tempCarFeeConfigDto.getConfigId().equals(tCarFeeConfigAttrDto.getConfigId())) {
+                    tempCarFeeConfigAttrDtoList.add(tCarFeeConfigAttrDto);
+                }
             }
+            tempCarFeeConfigDto.setTempCarFeeConfigAttrs(tempCarFeeConfigAttrDtoList);
         }
     }
 

--
Gitblit v1.8.0