优化水电抄表

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

@@ -142,7 +142,8 @@
         configStartTime,pfc.end_time configEndTime,pfc.payment_cd paymentCd,pfc.payment_cycle paymentCycle,td4.name
         billTypeName,pfa.value importFeeName,ifd.end_time importFeeEndTime,mw.cur_degrees curDegrees,mw.pre_degrees
         preDegrees,
-        mw.pre_reading_time preReadingTime,mw.cur_reading_time curReadingTime,pfa1.`value` deadlineTime,mw.price mwPrice
+        mw.pre_reading_time preReadingTime,mw.cur_reading_time curReadingTime,pfa1.`value` deadlineTime,mw.price mwPrice,
+        pfa2.`value` ownerName
         from pay_fee t
         INNER join pay_fee_config pfc on t.config_id = pfc.config_id and
         pfc.status_cd = '0'
@@ -155,6 +156,7 @@
         td4.table_columns = 'bill_type'
         LEFT JOIN pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002' and pfa.status_cd = '0'
         LEFT JOIN pay_fee_attrs pfa1 on t.fee_id = pfa1.fee_id and pfa1.spec_cd = '390010' and pfa1.status_cd = '0'
+        LEFT JOIN pay_fee_attrs pfa2 on t.fee_id = pfa2.fee_id and pfa2.spec_cd = '390008' and pfa2.status_cd = '0'
         left join import_fee_detail ifd on t.fee_id = ifd.fee_id and ifd.status_cd = '0' and t.fee_flag = '2006012'
         LEFT JOIN meter_water mw on t.fee_id = mw.fee_id and mw.status_cd = '0' and mw.community_id = t.community_id
         <if test="ownerId != null and ownerId != ''">

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

@@ -197,7 +197,7 @@ public class ExportFeeManualCollectionSMOImpl extends BaseComponentSMO implement
         String[] feePrintRemarks = null;
         if (feePrint != null) {
             feePrintRemarks = feePrint.getString("content").toLowerCase().replace("</br>", "").split("\n");
-        }else{
+        } else {
             feePrintRemarks = new String[]{""};
         }
         int defaultRowHeight = 280;
@@ -244,7 +244,11 @@ public class ExportFeeManualCollectionSMOImpl extends BaseComponentSMO implement
         Row row = sheet.createRow(0 + line);
         Cell cell0 = row.createCell(0);
         //cell0.setCellValue("缴费通知单totalHeight:" + totalHeight + "-totalPageHeight:" + totalPageHeight + "-curPageHeight:" + curPageHeight + "-freePageHeight:" + freePageHeight + "-line:" + line);
-        cell0.setCellValue("缴费通知单");
+        if (feePrint != null) {
+            cell0.setCellValue(feePrint.getString("printName") + "缴费通知单");
+        } else {
+            cell0.setCellValue("缴费通知单");
+        }
         //标题设置字体
         Font font = workbook.createFont();
         font.setFontName("黑体");
@@ -277,14 +281,18 @@ public class ExportFeeManualCollectionSMOImpl extends BaseComponentSMO implement
         subTitleCellStyle.setAlignment(HorizontalAlignment.CENTER);
         subTitleCellStyle.setVerticalAlignment(VerticalAlignment.BOTTOM);
         row = sheet.createRow(1 + line);
+        if (fees != null && fees.size() > 0) {
+            row.createCell(1).setCellValue("业主：" + fees.getJSONObject(0).getString("ownerName"));
+        } else {
+            row.createCell(1).setCellValue("业主：无");
+        }
 
-        Cell cell1 = row.createCell(1);
-        cell1.setCellValue("房号：" + room.getString("floorNum")
+        Cell cell2 = row.createCell(2);
+        cell2.setCellValue("房号：" + room.getString("floorNum")
                 + "-" + room.getString("unitNum")
                 + "-" + room.getString("roomNum"));
-        cell1.setCellStyle(subTitleCellStyle);
+        cell2.setCellStyle(subTitleCellStyle);
 
-        row.createCell(2).setCellValue("");
         row.createCell(3).setCellValue("");
         row.createCell(4).setCellValue("");
         Cell cell5 = row.createCell(5);
@@ -307,10 +315,10 @@ public class ExportFeeManualCollectionSMOImpl extends BaseComponentSMO implement
         cell0 = row.createCell(0);
         cell0.setCellValue("收费名称");
         cell0.setCellStyle(cellStyle);
-        cell1 = row.createCell(1);
+        Cell cell1 = row.createCell(1);
         cell1.setCellValue("收费标准");
         cell1.setCellStyle(cellStyle);
-        Cell cell2 = row.createCell(2);
+        cell2 = row.createCell(2);
         cell2.setCellValue("数量/面积");
         cell2.setCellStyle(cellStyle);
         Cell cell3 = row.createCell(3);
@@ -347,7 +355,11 @@ public class ExportFeeManualCollectionSMOImpl extends BaseComponentSMO implement
             cell2.setCellValue(room.getString("builtUpArea"));
             cell2.setCellStyle(cellStyle);
             cell3 = row.createCell(3);
-            cell3.setCellValue(startTime + "至" + endTime);
+            if (feeObj.containsKey("curDegrees")) {
+                cell3.setCellValue(startTime + "至" + endTime + " " + feeObj.getString("preDegrees") + "至" + feeObj.getString("curDegrees"));
+            } else {
+                cell3.setCellValue(startTime + "至" + endTime);
+            }
             cell3.setCellStyle(cellStyle);
             cell4 = row.createCell(4);
             cell4.setCellValue(feeObj.getString("feePrice"));