From dbea8ec9fde739d028d656ac7031091fae6e6c2c Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 19 七月 2023 09:03:50 +0800
Subject: [PATCH] 1、新增费用提前预生成账单2、优化强制回单3、区配置新增退费收据开关4、权限优化
---
service-report/src/main/java/com/java110/report/smo/impl/GeneratorOweFeeInnerServiceSMOImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/smo/impl/GeneratorOweFeeInnerServiceSMOImpl.java b/service-report/src/main/java/com/java110/report/smo/impl/GeneratorOweFeeInnerServiceSMOImpl.java
index 0a1e3da..9b6833e 100644
--- a/service-report/src/main/java/com/java110/report/smo/impl/GeneratorOweFeeInnerServiceSMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/smo/impl/GeneratorOweFeeInnerServiceSMOImpl.java
@@ -251,8 +251,12 @@
reportOweFeePo.setCommunityId(feeDto.getCommunityId());
reportOweFeePo.setConfigId(feeDto.getConfigId());
reportOweFeePo.setConfigName(feeDto.getFeeName());
- reportOweFeePo.setDeadlineTime(DateUtil.getFormatTimeString(feeDto.getDeadlineTime(), DateUtil.DATE_FORMATE_STRING_A));
- reportOweFeePo.setEndTime(DateUtil.getFormatTimeString(feeDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
+ if (feeDto.getDeadlineTime() != null) {
+ reportOweFeePo.setDeadlineTime(DateUtil.getFormatTimeString(feeDto.getDeadlineTime(), DateUtil.DATE_FORMATE_STRING_A));
+ }
+ if (feeDto.getEndTime() != null) {
+ reportOweFeePo.setEndTime(DateUtil.getFormatTimeString(feeDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
+ }
reportOweFeePo.setFeeId(feeDto.getFeeId());
reportOweFeePo.setFeeName(feeDto.getFeeName());
reportOweFeePo.setOwnerId(FeeAttrDto.getFeeAttrValue(feeDto, FeeAttrDto.SPEC_CD_OWNER_ID));
--
Gitblit v1.8.0