优化代码

java110-bean/src/main/java/com/java110/dto/reportOweFee/ReportOweFeeItemDto.java

@@ -19,6 +19,7 @@ public class ReportOweFeeItemDto extends PageDto implements Serializable {
     private String amountOwed;
     private String payerObjName;
     private String feeName;
+    private String configName;
     private String payerObjId;
     private Date startTime;
     private Date endTime;
@@ -79,4 +80,12 @@ public class ReportOweFeeItemDto extends PageDto implements Serializable {
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
+
+    public String getConfigName() {
+        return configName;
+    }
+
+    public void setConfigName(String configName) {
+        this.configName = configName;
+    }
 }

service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java

@@ -217,14 +217,16 @@ public class ExportReportFeeSMOImpl extends BaseComponentSMO implements IExportR
         List<FeeConfigDto> feeConfigDtos = new ArrayList<>();
         FeeConfigDto feeConfigDto = null;
         for (int oweFeeIndex = 0; oweFeeIndex < oweFees.size(); oweFeeIndex++) {
-            if (existsFeeConfig(feeConfigDtos, oweFees.getJSONObject(oweFeeIndex))) {
-                continue;
+            JSONArray items = oweFees.getJSONObject(oweFeeIndex).getJSONArray("items");
+            for(int itemIndex = 0; itemIndex < items.size(); itemIndex++) {
+                if (existsFeeConfig(feeConfigDtos, items.getJSONObject(itemIndex))) {
+                    continue;
+                }
+                feeConfigDto = new FeeConfigDto();
+                feeConfigDto.setConfigId(items.getJSONObject(oweFeeIndex).getString("configId"));
+                feeConfigDto.setFeeName(items.getJSONObject(oweFeeIndex).getString("configName"));
+                feeConfigDtos.add(feeConfigDto);
             }
-
-            feeConfigDto = new FeeConfigDto();
-            feeConfigDto.setConfigId(oweFees.getJSONObject(oweFeeIndex).getString("configId"));
-            feeConfigDto.setFeeName(oweFees.getJSONObject(oweFeeIndex).getString("configName"));
-            feeConfigDtos.add(feeConfigDto);
         }
 
         return feeConfigDtos;

service-report/src/main/java/com/java110/report/bmo/reportOweFee/impl/GetReportOweFeeBMOImpl.java

@@ -1,9 +1,7 @@
 package com.java110.report.bmo.reportOweFee.impl;
 
-import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.reportOweFee.ReportOweFeeDto;
 import com.java110.dto.reportOweFee.ReportOweFeeItemDto;
-import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
 import com.java110.intf.report.IReportOweFeeInnerServiceSMO;
 import com.java110.report.bmo.reportOweFee.IGetReportOweFeeBMO;
 import com.java110.utils.util.DateUtil;
@@ -26,8 +24,6 @@ public class GetReportOweFeeBMOImpl implements IGetReportOweFeeBMO {
     private IReportOweFeeInnerServiceSMO reportOweFeeInnerServiceSMOImpl;
 
 
-
-
     /**
      * @param reportOweFeeDto
      * @return 订单服务能够接受的报文
@@ -184,6 +180,7 @@ public class GetReportOweFeeBMOImpl implements IGetReportOweFeeBMO {
                 reportOweFeeItemDto.setAmountOwed(reportOweFeeDto.getAmountOwed());
                 reportOweFeeItemDto.setPayerObjId(reportOweFeeDto.getPayerObjId());
                 reportOweFeeItemDto.setPayerObjName(reportOweFeeDto.getPayerObjName());
+                reportOweFeeItemDto.setConfigName(reportOweFeeDto.getConfigName());
                 try {
                     reportOweFeeItemDto.setStartTime(DateUtil.getDateFromString(reportOweFeeDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
                     reportOweFeeItemDto.setEndTime(DateUtil.getDateFromString(reportOweFeeDto.getDeadlineTime(), DateUtil.DATE_FORMATE_STRING_A));