소스 검색

优化缴费清单显示手机号

java110 3 년 전
부모
커밋
729654d8d8

+ 2 - 2
java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml

@@ -343,7 +343,7 @@
         payerObjName,t.config_id,t.config_id configId,t.fee_name,t.fee_name
         feeName,t.end_time,t.end_time endTime,t.community_id,t.community_id
         communityId,t.payer_obj_type,t.payer_obj_type payerObjType,t.payer_obj_id,t.payer_obj_id payerObjId,
-        bo.owner_id ownerId,bo.name ownerName
+        bo.owner_id ownerId,bo.name ownerName,bo.link ownerTel
         from report_owe_fee t
         left join building_owner_room_rel borr on borr.room_id = t.payer_obj_id and borr.status_cd = '0'
         left join building_owner bo on borr.owner_id = bo.owner_id and bo.owner_type_cd = '1001' and bo.status_cd = '0'
@@ -427,7 +427,7 @@
         payerObjName,t.config_id,t.config_id configId,t.fee_name,t.fee_name
         feeName,t.end_time,t.end_time endTime,t.community_id,t.community_id
         communityId,t.payer_obj_type,t.payer_obj_type payerObjType,t.payer_obj_id,t.payer_obj_id payerObjId,
-        bo.owner_id ownerId,bo.name ownerName
+        bo.owner_id ownerId,bo.name ownerName,bo.link ownerTel
         from report_owe_fee t
         left join owner_car oc on oc.car_id = t.payer_obj_id and oc.status_cd = '0'
         left join building_owner bo on oc.owner_id = bo.owner_id and bo.owner_type_cd = '1001' and bo.status_cd = '0'

+ 12 - 10
service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java

@@ -209,15 +209,16 @@ public class ExportReportFeeSMOImpl extends DefaultAbstractComponentSMO implemen
         Row row = sheet.createRow(0);
         row.createCell(0).setCellValue("收费对象");
         row.createCell(1).setCellValue("业主名称");
-        row.createCell(2).setCellValue("开始时间");
-        row.createCell(3).setCellValue("结束时间");
+        row.createCell(2).setCellValue("手机号");
+        row.createCell(3).setCellValue("开始时间");
+        row.createCell(4).setCellValue("结束时间");
         if (!StringUtil.isEmpty(configIds)) {
             for (int feeConfigIndex = 0; feeConfigIndex < feeConfigDtos.size(); feeConfigIndex++) {
-                row.createCell(4 + feeConfigIndex).setCellValue(feeConfigDtos.get(feeConfigIndex).getFeeName());
+                row.createCell(5 + feeConfigIndex).setCellValue(feeConfigDtos.get(feeConfigIndex).getFeeName());
             }
-            row.createCell(4 + feeConfigDtos.size()).setCellValue("合计");
+            row.createCell(5 + feeConfigDtos.size()).setCellValue("合计");
         } else {
-            row.createCell(4).setCellValue("合计");
+            row.createCell(5).setCellValue("合计");
         }
 
 
@@ -227,15 +228,16 @@ public class ExportReportFeeSMOImpl extends DefaultAbstractComponentSMO implemen
             dataObj = oweFees.getJSONObject(roomIndex);
             row.createCell(0).setCellValue(dataObj.getString("payerObjName"));
             row.createCell(1).setCellValue(dataObj.getString("ownerName"));
-            row.createCell(2).setCellValue(dataObj.getString("endTime"));
-            row.createCell(3).setCellValue(dataObj.getString("deadlineTime"));
+            row.createCell(2).setCellValue(dataObj.getString("ownerTel"));
+            row.createCell(3).setCellValue(dataObj.getString("endTime"));
+            row.createCell(4).setCellValue(dataObj.getString("deadlineTime"));
             if (!StringUtil.isEmpty(configIds)) {
                 for (int feeConfigIndex = 0; feeConfigIndex < feeConfigDtos.size(); feeConfigIndex++) {
-                    row.createCell(4 + feeConfigIndex).setCellValue(getFeeConfigAmount(feeConfigDtos.get(feeConfigIndex), dataObj));
+                    row.createCell(5 + feeConfigIndex).setCellValue(getFeeConfigAmount(feeConfigDtos.get(feeConfigIndex), dataObj));
                 }
-                row.createCell(4 + feeConfigDtos.size()).setCellValue(getAllFeeOweAmount(feeConfigDtos, dataObj));
+                row.createCell(5 + feeConfigDtos.size()).setCellValue(getAllFeeOweAmount(feeConfigDtos, dataObj));
             } else {
-                row.createCell(4).setCellValue(getAllFeeOweAmount(feeConfigDtos, dataObj));
+                row.createCell(5).setCellValue(getAllFeeOweAmount(feeConfigDtos, dataObj));
             }
 
         }

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

@@ -187,10 +187,12 @@ public class GetReportOweFeeBMOImpl implements IGetReportOweFeeBMO {
                 List<ReportOweFeeDto> reportOweFees = reportOweFeeInnerServiceSMOImpl.queryReportAllOweFeesByRoom(reportOwe);
                 reportOweFee.setOweId(reportOweFees.get(0).getOweId());
                 reportOweFee.setOwnerName(reportOweFees.get(0).getOwnerName());
+                reportOweFee.setOwnerTel(reportOweFees.get(0).getOwnerTel());
             } else if (reportOweFee.getPayerObjType().equals("6666")) {
                 List<ReportOweFeeDto> reportOweFees = reportOweFeeInnerServiceSMOImpl.queryReportAllOweFeesByCar(reportOwe);
                 reportOweFee.setOweId(reportOweFees.get(0).getOweId());
                 reportOweFee.setOwnerName(reportOweFees.get(0).getOwnerName());
+                reportOweFee.setOwnerTel(reportOweFees.get(0).getOwnerTel());
             }
             reportOweFeeDtos.add(reportOweFee);
         }