优化商户

service-job/src/main/java/com/java110/job/export/adapt/ReportFeeDetailCarAdapt.java

@@ -122,11 +122,11 @@ public class ReportFeeDetailCarAdapt implements IExportDataAdapt {
             row.createCell(3).setCellValue(dataObj.getString("receivedFee"));
 
             for (int dictIndex = 0; dictIndex < dictDtos.size(); dictIndex++) {
-                oweFee = dataObj.getString("oweFee" + dictDtos.get(0).getStatusCd());
+                oweFee = dataObj.getString("oweFee" + dictDtos.get(dictIndex).getStatusCd());
                 if (StringUtil.isEmpty(oweFee)) {
                     oweFee = "0";
                 }
-                receivedFee = dataObj.getString("receivedFee" + dictDtos.get(0).getStatusCd());
+                receivedFee = dataObj.getString("receivedFee" + dictDtos.get(dictIndex).getStatusCd());
                 if (StringUtil.isEmpty(receivedFee)) {
                     receivedFee = "0";
                 }
@@ -159,7 +159,7 @@ public class ReportFeeDetailCarAdapt implements IExportDataAdapt {
         ownerCarDto.setCarTypeCd(OwnerCarDto.CAR_TYPE_PRIMARY);
         return ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
     }
-
+    
     /**
      * 计算合同欠费 实收费用
      *
@@ -187,15 +187,17 @@ public class ReportFeeDetailCarAdapt implements IExportDataAdapt {
         }
 
         queryStatisticsDto.setObjIds(objIds.toArray(new String[objIds.size()]));
-        List<Map> infos = reportFeeStatisticsInnerServiceSMOImpl.getOwnerFeeSummary(queryStatisticsDto);
+        List<Map> infos = reportFeeStatisticsInnerServiceSMOImpl.getObjFeeSummary(queryStatisticsDto);
 
         if (infos == null || infos.size() < 1) {
             return datas;
         }
 
-        BigDecimal oweFee = new BigDecimal(0.00);
-        BigDecimal receivedFee = new BigDecimal(0.00);
+        BigDecimal oweFee = null;
+        BigDecimal receivedFee = null;
         for (int dataIndex = 0; dataIndex < datas.size(); dataIndex++) {
+            oweFee = new BigDecimal(0.00);
+            receivedFee = new BigDecimal(0.00);
             data = datas.getJSONObject(dataIndex);
             for (Map info : infos) {
                 if (!data.get("carId").toString().equals(info.get("objId"))) {
@@ -203,7 +205,7 @@ public class ReportFeeDetailCarAdapt implements IExportDataAdapt {
                 }
 
                 oweFee = oweFee.add(new BigDecimal(info.get("oweFee").toString()));
-                receivedFee = oweFee.add(new BigDecimal(info.get("receivedFee").toString()));
+                receivedFee = receivedFee.add(new BigDecimal(info.get("receivedFee").toString()));
                 data.put("oweFee" + info.get("feeTypeCd").toString(), info.get("oweFee"));
                 data.put("receivedFee" + info.get("feeTypeCd").toString(), info.get("receivedFee"));
             }

service-job/src/main/java/com/java110/job/export/adapt/ReportFeeDetailContractAdapt.java

@@ -123,11 +123,11 @@ public class ReportFeeDetailContractAdapt implements IExportDataAdapt {
             row.createCell(3).setCellValue(dataObj.getString("receivedFee"));
 
             for (int dictIndex = 0; dictIndex < dictDtos.size(); dictIndex++) {
-                oweFee = dataObj.getString("oweFee" + dictDtos.get(0).getStatusCd());
+                oweFee = dataObj.getString("oweFee" + dictDtos.get(dictIndex).getStatusCd());
                 if (StringUtil.isEmpty(oweFee)) {
                     oweFee = "0";
                 }
-                receivedFee = dataObj.getString("receivedFee" + dictDtos.get(0).getStatusCd());
+                receivedFee = dataObj.getString("receivedFee" + dictDtos.get(dictIndex).getStatusCd());
                 if (StringUtil.isEmpty(receivedFee)) {
                     receivedFee = "0";
                 }
@@ -187,17 +187,19 @@ public class ReportFeeDetailContractAdapt implements IExportDataAdapt {
             return datas;
         }
 
-        BigDecimal oweFee = new BigDecimal(0.00);
-        BigDecimal receivedFee = new BigDecimal(0.00);
+        BigDecimal oweFee = null;
+        BigDecimal receivedFee = null;
         for (int dataIndex = 0; dataIndex < datas.size(); dataIndex++) {
             data = datas.getJSONObject(dataIndex);
+            oweFee = new BigDecimal(0.00);
+            receivedFee = new BigDecimal(0.00);
             for (Map info : infos) {
                 if (!data.get("contractId").toString().equals(info.get("objId"))) {
                     continue;
                 }
 
                 oweFee = oweFee.add(new BigDecimal(info.get("oweFee").toString()));
-                receivedFee = oweFee.add(new BigDecimal(info.get("receivedFee").toString()));
+                receivedFee = receivedFee.add(new BigDecimal(info.get("receivedFee").toString()));
                 data.put("oweFee" + info.get("feeTypeCd").toString(), info.get("oweFee"));
                 data.put("receivedFee" + info.get("feeTypeCd").toString(), info.get("receivedFee"));
             }

service-job/src/main/java/com/java110/job/export/adapt/ReportFeeDetailOwnerAdapt.java

@@ -120,11 +120,11 @@ public class ReportFeeDetailOwnerAdapt implements IExportDataAdapt {
             row.createCell(3).setCellValue(dataObj.getString("receivedFee"));
 
             for (int dictIndex = 0; dictIndex < dictDtos.size(); dictIndex++) {
-                oweFee = dataObj.getString("oweFee" + dictDtos.get(0).getStatusCd());
+                oweFee = dataObj.getString("oweFee" + dictDtos.get(dictIndex).getStatusCd());
                 if (StringUtil.isEmpty(oweFee)) {
                     oweFee = "0";
                 }
-                receivedFee = dataObj.getString("receivedFee" + dictDtos.get(0).getStatusCd());
+                receivedFee = dataObj.getString("receivedFee" + dictDtos.get(dictIndex).getStatusCd());
                 if (StringUtil.isEmpty(receivedFee)) {
                     receivedFee = "0";
                 }
@@ -156,7 +156,6 @@ public class ReportFeeDetailOwnerAdapt implements IExportDataAdapt {
         return ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
     }
 
-
     /**
      * 计算业主欠费 实收费用
      *
@@ -188,17 +187,19 @@ public class ReportFeeDetailOwnerAdapt implements IExportDataAdapt {
             return datas;
         }
 
-        BigDecimal oweFee = new BigDecimal(0.00);
-        BigDecimal receivedFee = new BigDecimal(0.00);
+        BigDecimal oweFee = null;
+        BigDecimal receivedFee = null;
         for (int dataIndex = 0; dataIndex < datas.size(); dataIndex++) {
             data = datas.getJSONObject(dataIndex);
+            oweFee = new BigDecimal(0.00);
+            receivedFee = new BigDecimal(0.00);
             for (Map info : infos) {
                 if (!data.get("ownerId").toString().equals(info.get("ownerId"))) {
                     continue;
                 }
 
                 oweFee = oweFee.add(new BigDecimal(info.get("oweFee").toString()));
-                receivedFee = oweFee.add(new BigDecimal(info.get("receivedFee").toString()));
+                receivedFee = receivedFee.add(new BigDecimal(info.get("receivedFee").toString()));
                 data.put("oweFee" + info.get("feeTypeCd").toString(), info.get("oweFee"));
                 data.put("receivedFee" + info.get("feeTypeCd").toString(), info.get("receivedFee"));
                 data.put("objName", info.get("objName"));

service-job/src/main/java/com/java110/job/export/adapt/ReportFeeDetailRoomAdapt.java

@@ -118,11 +118,11 @@ public class ReportFeeDetailRoomAdapt implements IExportDataAdapt {
             row.createCell(3).setCellValue(dataObj.getString("receivedFee"));
 
             for(int dictIndex = 0; dictIndex < dictDtos.size(); dictIndex++) {
-                oweFee = dataObj.getString("oweFee"+dictDtos.get(0).getStatusCd());
+                oweFee = dataObj.getString("oweFee"+dictDtos.get(dictIndex).getStatusCd());
                 if(StringUtil.isEmpty(oweFee)){
                     oweFee = "0";
                 }
-                receivedFee = dataObj.getString("receivedFee"+dictDtos.get(0).getStatusCd());
+                receivedFee = dataObj.getString("receivedFee"+dictDtos.get(dictIndex).getStatusCd());
                 if(StringUtil.isEmpty(receivedFee)){
                     receivedFee = "0";
                 }
@@ -217,9 +217,11 @@ public class ReportFeeDetailRoomAdapt implements IExportDataAdapt {
             return datas;
         }
 
-        BigDecimal oweFee = new BigDecimal(0.00);
-        BigDecimal receivedFee = new BigDecimal(0.00);
+        BigDecimal oweFee = null;
+        BigDecimal receivedFee = null;
         for(int dataIndex = 0; dataIndex < datas.size();dataIndex ++){
+            oweFee = new BigDecimal(0.00);
+            receivedFee = new BigDecimal(0.00);
             data = datas.getJSONObject(dataIndex);
             for(Map info : infos){
                 if(!data.get("roomId").toString().equals(info.get("objId"))){
@@ -227,7 +229,7 @@ public class ReportFeeDetailRoomAdapt implements IExportDataAdapt {
                 }
 
                 oweFee = oweFee.add(new BigDecimal(info.get("oweFee").toString()));
-                receivedFee = oweFee.add(new BigDecimal(info.get("receivedFee").toString()));
+                receivedFee = receivedFee.add(new BigDecimal(info.get("receivedFee").toString()));
                 data.put("oweFee"+info.get("feeTypeCd").toString(),info.get("oweFee"));
                 data.put("receivedFee"+info.get("feeTypeCd").toString(),info.get("receivedFee"));
             }
@@ -237,4 +239,6 @@ public class ReportFeeDetailRoomAdapt implements IExportDataAdapt {
 
         return datas;
     }
+
+
 }

service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeDetailContractCmd.java

@@ -115,17 +115,19 @@ public class QueryReportFeeDetailContractCmd extends Cmd {
             return datas;
         }
 
-        BigDecimal oweFee = new BigDecimal(0.00);
-        BigDecimal receivedFee = new BigDecimal(0.00);
+        BigDecimal oweFee = null;
+        BigDecimal receivedFee = null;
         for (int dataIndex = 0; dataIndex < datas.size(); dataIndex++) {
             data = datas.getJSONObject(dataIndex);
+            oweFee = new BigDecimal(0.00);
+            receivedFee = new BigDecimal(0.00);
             for (Map info : infos) {
                 if (!data.get("contractId").toString().equals(info.get("objId"))) {
                     continue;
                 }
 
                 oweFee = oweFee.add(new BigDecimal(info.get("oweFee").toString()));
-                receivedFee = oweFee.add(new BigDecimal(info.get("receivedFee").toString()));
+                receivedFee = receivedFee.add(new BigDecimal(info.get("receivedFee").toString()));
                 data.put("oweFee" + info.get("feeTypeCd").toString(), info.get("oweFee"));
                 data.put("receivedFee" + info.get("feeTypeCd").toString(), info.get("receivedFee"));
             }