未解保函实收问题处理

java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionServiceDaoImplMapper.xml

@@ -20,7 +20,7 @@
         builtUpArea,t.owner_name,t.owner_name ownerName,t.config_id,t.config_id configId,t.obj_id,t.obj_id
         objId,t.fee_name,t.fee_name feeName,t.community_id,t.community_id communityId,t.collection_id,t.collection_id
         collectionId,t.obj_type,t.obj_type objType,rd.collection_year collectionYear,rd.receivable_amount receivableAmount,
-        rd.relation_year relationYear
+        rd.relation_year relationYear,rd.received_amount receivedAmount
         from report_fee_year_collection t
         left join report_fee_year_collection_detail rd on t.collection_id = rd.collection_id and rd.status_cd = '0' and rd.community_id = t.community_id
         where 1 =1

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

@@ -187,7 +187,7 @@ public class ExportReportFeeSMOImpl extends BaseComponentSMO implements IExportR
             row.createCell(4).setCellValue(dataObj.getString("feeName"));
             row.createCell(5).setCellValue(dataObj.getString("receivableAmount"));
 
-            reportFeeYearCollectionDetailDtos = rooms.getJSONObject(roomIndex).getJSONArray("reportFeeYearCollectionDetailDtos");
+            reportFeeYearCollectionDetailDtos = dataObj.getJSONArray("reportFeeYearCollectionDetailDtos");
             for (int detailIndex = 0; detailIndex < reportFeeYearCollectionDetailDtos.size(); detailIndex++) {
                 row.createCell(6 + detailIndex).setCellValue(reportFeeYearCollectionDetailDtos.getJSONObject(detailIndex).getString("receivedAmount"));
             }