diff --git a/src/main/java/com/seeyon/apps/assetstenant/bill/BillService.java b/src/main/java/com/seeyon/apps/assetstenant/bill/BillService.java index 8bfb3b8..0eeda1c 100644 --- a/src/main/java/com/seeyon/apps/assetstenant/bill/BillService.java +++ b/src/main/java/com/seeyon/apps/assetstenant/bill/BillService.java @@ -309,7 +309,7 @@ public class BillService { subTableRowData.put("账单-资产编号", fieldsMap.get("资产编号")); subTableRowData.put("账单-资产名称", fieldsMap.get("资产名称")); FormFieldBean formFieldBean = subTableBean.getFieldBeanByDisplay("收款结果"); - subTableRowData.put("账单-收款结果", EnumMapUtils.getEnumItemValueByEnumId("已结清",formFieldBean.getEnumId())); + subTableRowData.put("收款结果", EnumMapUtils.getEnumItemValueByEnumId("已结清",formFieldBean.getEnumId())); subFormDataList.add(subTableRowData); // 9. 获取合同信息 + 非空校验 String contractNo = (String) fieldsMap.get("合同编号"); @@ -338,7 +338,7 @@ public class BillService { } // 11. 组装主表数据(线程安全日期) TableContext receivePayFlowTableContext = FormTableExecutor.master(templateCode); - mainData.put("选择收款项", EnumMapUtils.getEnumItemValueByDisplayValue(receivePayFlowTableContext.getTableBean(), "收款项", "租金")); + mainData.put("选择收款项", EnumMapUtils.getEnumItemValueByDisplayValue(receivePayFlowTableContext.getTableBean(), "选择收款项", "租金")); mainData.put("经办日期", LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); mainData.put("合同编号", contractNo); mainData.put("本次收款金额", actualReceipts); diff --git a/src/main/java/com/seeyon/apps/assetstenant/bill/FeeRecordService.java b/src/main/java/com/seeyon/apps/assetstenant/bill/FeeRecordService.java index 9a05fcc..e8bf198 100644 --- a/src/main/java/com/seeyon/apps/assetstenant/bill/FeeRecordService.java +++ b/src/main/java/com/seeyon/apps/assetstenant/bill/FeeRecordService.java @@ -94,12 +94,10 @@ public class FeeRecordService { } public void payCallBack(String billNo, String bizType, String payDate) throws Exception { - if("rent".equals(bizType)) { + if("rent".equals(bizType) || "margin".equals(bizType)) { billService.payCallBack(billNo,payDate); }else if("wae".equals(bizType)){ // waeBillService.payCallBack(billNo,payDate); - }else if("margin".equals(bizType)){ - } }