Your Name пре 2 година
родитељ
комит
1f032e04b7

+ 1 - 1
java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml

@@ -1747,7 +1747,7 @@
         ruleName,pfdd.discount_price discountPrice,co.contract_code contractCode,pfo.`value` ownerName,t.pay_order_id oId,
         d2.name feeTypeCdName,pfc.fee_type_cd feeTypeCd,t.state,d3.name stateName,t.fee_id feeId,pft.`value` repairId,
         t.detail_id,t.detail_id detailId,pf.payer_obj_id,pfb.value ownerId,concat(pa.num,'停车场',ps.num,'车位') psName,
-        fad.amount withholdAmount,t.cashier_id cashierId,t.cashier_name cashierName,t.payable_amount payableAmount,pfc.fee_flag feeFlag
+        fad.amount withholdAmount,t.cashier_id cashierId,t.cashier_name cashierName,t.payable_amount payableAmount,pfc.fee_flag feeFlag,t.remark
         from pay_fee_detail t
         left JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
         left join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'

+ 1 - 1
service-job/src/main/java/com/java110/job/adapt/IDatabusAdapt.java

@@ -38,7 +38,7 @@ public interface IDatabusAdapt {
      * @param business   当前处理业务
      * @param businesses 所有业务信息
      */
-    public void execute(Business business, List<Business> businesses) throws Exception;
+     void execute(Business business, List<Business> businesses) throws Exception;
 
     /**
      * 开门接口

+ 2 - 0
service-job/src/main/java/com/java110/job/export/adapt/ReportPayFeeDetailAdapt.java

@@ -59,6 +59,7 @@ public class ReportPayFeeDetailAdapt implements IExportDataAdapt {
         row.createCell(19).setCellValue("车位");
         row.createCell(20).setCellValue("账户抵扣");
         row.createCell(21).setCellValue("收银员");
+        row.createCell(22).setCellValue("备注");
         JSONObject reqJson = exportDataDto.getReqJson();
         ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = BeanConvertUtil.covertBean(reqJson, ReportFeeMonthStatisticsDto.class);
         if (reqJson.containsKey("roomName") && !StringUtil.isEmpty(reqJson.getString("roomName"))) {
@@ -121,6 +122,7 @@ public class ReportPayFeeDetailAdapt implements IExportDataAdapt {
             row.createCell(19).setCellValue(dataObj.getString("psName"));
             row.createCell(20).setCellValue(dataObj.getString("withholdAmount"));
             row.createCell(21).setCellValue(dataObj.getString("cashierName"));
+            row.createCell(22).setCellValue(dataObj.getString("remark"));
         }
     }
 }