From d516e38fd44e186f393bbb05c4e7ca34b323b609 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 16 五月 2023 18:50:52 +0800
Subject: [PATCH] optimize report
---
service-job/src/main/java/com/java110/job/task/fee/AccountDeductionPayFeeTemplate.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/task/fee/AccountDeductionPayFeeTemplate.java b/service-job/src/main/java/com/java110/job/task/fee/AccountDeductionPayFeeTemplate.java
index 19dbf35..c46bb44 100644
--- a/service-job/src/main/java/com/java110/job/task/fee/AccountDeductionPayFeeTemplate.java
+++ b/service-job/src/main/java/com/java110/job/task/fee/AccountDeductionPayFeeTemplate.java
@@ -111,6 +111,7 @@
feeDto.setCommunityId(tmpAccountDto.getPartId());
feeDto.setOwnerId(tmpAccountDto.getObjId());
feeDto.setState(FeeDto.STATE_DOING);
+ feeDto.setDeductFrom("Y");
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
if (feeDtos == null || feeDtos.size() < 1) {
return;
@@ -128,6 +129,7 @@
return;
}
int flag = 0;
+ computeFeeSMOImpl.freshFeeObjName(tmpFeeDtos);
for (FeeDto tmpFeeDto : tmpFeeDtos) {
try {
if (tmpFeeDto.getFeePrice() > Double.parseDouble(tmpAccountDto.getAmount())) {
@@ -139,7 +141,11 @@
accountDetailPo.setAmount(tmpFeeDto.getFeePrice() + "");
accountDetailPo.setObjId(tmpAccountDto.getObjId());
accountDetailPo.setObjType(tmpAccountDto.getObjType());
- accountDetailPo.setRemark("缂磋垂鎵ｆ");
+ accountDetailPo.setRemark("缂磋垂鎵ｆ,璐圭敤瀵硅薄锛�"
+ + tmpFeeDto.getPayerObjName()
+ + ",璐圭敤锛�" + tmpFeeDto.getFeeName()
+ + ",鏃堕棿锛�" + DateUtil.getFormatTimeString(tmpFeeDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A)
+ + "鑷�" + DateUtil.getFormatTimeString(tmpFeeDto.getDeadlineTime(), DateUtil.DATE_FORMATE_STRING_A));
flag = accountInnerServiceSMOImpl.withholdAccount(accountDetailPo);
if (flag < 1) {
continue;//鎵ｆ澶辫触
@@ -149,8 +155,8 @@
JSONArray fees = new JSONArray();
JSONObject fee = new JSONObject();
fee.put("feeId", tmpFeeDto.getFeeId());
- fee.put("startTime", DateUtil.getFormatTimeString(tmpFeeDto.getEndTime(),DateUtil.DATE_FORMATE_STRING_A));
- fee.put("endTime", DateUtil.getFormatTimeString(tmpFeeDto.getDeadlineTime(),DateUtil.DATE_FORMATE_STRING_A));
+ fee.put("startTime", DateUtil.getFormatTimeString(tmpFeeDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
+ fee.put("endTime", DateUtil.getFormatTimeString(tmpFeeDto.getDeadlineTime(), DateUtil.DATE_FORMATE_STRING_A));
fee.put("receivedAmount", tmpFeeDto.getFeePrice());
fee.put("primeRate", "1");
fee.put("remark", "瀹氭椂璐︽埛鎵ｆ缂磋垂");
--
Gitblit v1.8.0