优化代码

java110-bean/src/main/java/com/java110/dto/tempCarFeeConfig/TempCarFeeConfigAttrDto.java

@@ -17,6 +17,7 @@ public class TempCarFeeConfigAttrDto extends PageDto implements Serializable {
 
     private String attrId;
     private String configId;
+    private String[] configIds;
     private String specCd;
     private String value;
     private String communityId;
@@ -83,4 +84,12 @@ public class TempCarFeeConfigAttrDto extends PageDto implements Serializable {
     public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
+
+    public String[] getConfigIds() {
+        return configIds;
+    }
+
+    public void setConfigIds(String[] configIds) {
+        this.configIds = configIds;
+    }
 }

java110-bean/src/main/java/com/java110/dto/tempCarFeeConfig/TempCarFeeConfigDto.java

@@ -1,8 +1,10 @@
 package com.java110.dto.tempCarFeeConfig;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -15,14 +17,18 @@ import java.util.Date;
 public class TempCarFeeConfigDto extends PageDto implements Serializable {
 
     private String carType;
-private String configId;
-private String feeName;
-private String paId;
-private String areaNum;
-private String startTime;
-private String endTime;
-private String ruleId;
-private String communityId;
+    private String carTypeName;
+    private String configId;
+    private String feeName;
+    private String paId;
+    private String areaNum;
+    private String startTime;
+    private String endTime;
+    private String ruleId;
+    private String ruleName;
+    private String communityId;
+
+    private List<TempCarFeeConfigAttrDto> tempCarFeeConfigAttrs;
 
 
     private Date createTime;
@@ -33,55 +39,72 @@ private String communityId;
     public String getCarType() {
         return carType;
     }
-public void setCarType(String carType) {
+
+    public void setCarType(String carType) {
         this.carType = carType;
     }
-public String getConfigId() {
+
+    public String getConfigId() {
         return configId;
     }
-public void setConfigId(String configId) {
+
+    public void setConfigId(String configId) {
         this.configId = configId;
     }
-public String getFeeName() {
+
+    public String getFeeName() {
         return feeName;
     }
-public void setFeeName(String feeName) {
+
+    public void setFeeName(String feeName) {
         this.feeName = feeName;
     }
-public String getPaId() {
+
+    public String getPaId() {
         return paId;
     }
-public void setPaId(String paId) {
+
+    public void setPaId(String paId) {
         this.paId = paId;
     }
-public String getAreaNum() {
+
+    public String getAreaNum() {
         return areaNum;
     }
-public void setAreaNum(String areaNum) {
+
+    public void setAreaNum(String areaNum) {
         this.areaNum = areaNum;
     }
-public String getStartTime() {
+
+    public String getStartTime() {
         return startTime;
     }
-public void setStartTime(String startTime) {
+
+    public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
-public String getEndTime() {
+
+    public String getEndTime() {
         return endTime;
     }
-public void setEndTime(String endTime) {
+
+    public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
-public String getRuleId() {
+
+    public String getRuleId() {
         return ruleId;
     }
-public void setRuleId(String ruleId) {
+
+    public void setRuleId(String ruleId) {
         this.ruleId = ruleId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
@@ -101,4 +124,28 @@ public void setCommunityId(String communityId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getRuleName() {
+        return ruleName;
+    }
+
+    public void setRuleName(String ruleName) {
+        this.ruleName = ruleName;
+    }
+
+    public String getCarTypeName() {
+        return carTypeName;
+    }
+
+    public void setCarTypeName(String carTypeName) {
+        this.carTypeName = carTypeName;
+    }
+
+    public List<TempCarFeeConfigAttrDto> getTempCarFeeConfigAttrs() {
+        return tempCarFeeConfigAttrs;
+    }
+
+    public void setTempCarFeeConfigAttrs(List<TempCarFeeConfigAttrDto> tempCarFeeConfigAttrs) {
+        this.tempCarFeeConfigAttrs = tempCarFeeConfigAttrs;
+    }
 }

java110-db/src/main/resources/mapper/fee/TempCarFeeConfigServiceDaoImplMapper.xml

@@ -106,8 +106,10 @@
         select t.car_type,t.car_type carType,t.config_id,t.config_id configId,t.fee_name,t.fee_name
         feeName,t.pa_id,t.pa_id paId,t.area_num,t.area_num areaNum,t.status_cd,t.status_cd
         statusCd,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.b_id,t.b_id bId,t.rule_id,t.rule_id
-        ruleId,t.community_id,t.community_id communityId
+        ruleId,t.community_id,t.community_id communityId,tcfr.rule_name ruleName,td.name carTypeName
         from temp_car_fee_config t
+        left join temp_car_fee_rule tcfr on t.rule_id = tcfr.rule_id and tcfr.status_cd = '0'
+        left join t_dict td on t.car_type = td.status_cd and td.table_name = 'temp_car_fee_config' and td.table_columns = 'car_type'
         where 1 =1
         <if test="carType !=null and carType != ''">
             and t.car_type= #{carType}

service-fee/src/main/java/com/java110/fee/smo/impl/TempCarFeeConfigInnerServiceSMOImpl.java

@@ -3,11 +3,12 @@ package com.java110.fee.smo.impl;
 
 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 @@ public class TempCarFeeConfigInnerServiceSMOImpl extends BaseServiceSMO implemen
     @Autowired
     private ITempCarFeeConfigServiceDao tempCarFeeConfigServiceDaoImpl;
 
+    @Autowired
+    private ITempCarFeeConfigAttrInnerServiceSMO tempCarFeeConfigAttrInnerServiceSMOImpl;
+
 
     @Override
     public List<TempCarFeeConfigDto> queryTempCarFeeConfigs(@RequestBody TempCarFeeConfigDto tempCarFeeConfigDto) {
@@ -45,20 +49,42 @@ public class TempCarFeeConfigInnerServiceSMOImpl extends BaseServiceSMO implemen
 
         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);
         }
     }