From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java | 41 +++++++++++------------------------------
1 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java b/service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java
index 8698fdf..67f4c8e 100755
--- a/service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java
@@ -402,6 +402,7 @@
/**
* 鍓嶅彴鏌ヨ鍒嗛〉鏌ヨ
+ *
* @param reportFeeMonthStatisticsDto
* @return
*/
@@ -831,43 +832,23 @@
@Override
public ResponseEntity<String> queryHuaningOweFee(ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
- int count = reportFeeMonthStatisticsInnerServiceSMOImpl.queryHuaningOweFeeCount(reportFeeMonthStatisticsDto);
List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsDtos = null;
- if (count > 0) {
- reportFeeMonthStatisticsDtos = reportFeeMonthStatisticsInnerServiceSMOImpl.queryHuaningOweFee(reportFeeMonthStatisticsDto);
- } else {
- reportFeeMonthStatisticsDtos = new ArrayList<>();
- }
+ reportFeeMonthStatisticsDtos = reportFeeMonthStatisticsInnerServiceSMOImpl.queryHuaningOweFee(reportFeeMonthStatisticsDto);
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reportFeeMonthStatisticsDto.getRow()), count, reportFeeMonthStatisticsDtos);
-
- ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+ ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(reportFeeMonthStatisticsDtos);
return responseEntity;
}
@Override
public ResponseEntity<String> queryHuaningPayFee(Map paramInfo) {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.YEAR, (int) paramInfo.get("year"));
- calendar.set(Calendar.MONTH, (int) paramInfo.get("month") - 1);
- paramInfo.put("yearMonth", DateUtil.getFormatTimeString(calendar.getTime(), "YYYY-MM"));
- calendar.add(Calendar.MONTH, 1);
- paramInfo.put("nextYear", calendar.get(Calendar.YEAR));
- paramInfo.put("nextMonth", calendar.get(Calendar.MONTH) + 1);
- int count = reportFeeMonthStatisticsInnerServiceSMOImpl.queryHuaningPayFeeCount(paramInfo);
List<Map> reportFeeMonthStatisticsDtos = null;
- if (count > 0) {
- reportFeeMonthStatisticsDtos = reportFeeMonthStatisticsInnerServiceSMOImpl.queryHuaningPayFee(paramInfo);
- } else {
- reportFeeMonthStatisticsDtos = new ArrayList<>();
- }
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (int) paramInfo.get("row")), count, reportFeeMonthStatisticsDtos);
+ reportFeeMonthStatisticsDtos = reportFeeMonthStatisticsInnerServiceSMOImpl.queryHuaningPayFee(paramInfo);
- ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+ ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(reportFeeMonthStatisticsDtos);
return responseEntity;
}
@@ -899,12 +880,12 @@
@Override
public ResponseEntity<String> queryHuaningOweFeeDetail(Map paramInfo) {
- Calendar calendar = Calendar.getInstance();
+ //Calendar calendar = Calendar.getInstance();
int count = reportFeeMonthStatisticsInnerServiceSMOImpl.queryHuaningOweFeeDetailCount(paramInfo);
List<Map> reportFeeMonthStatisticsDtos = null;
if (count > 0) {
reportFeeMonthStatisticsDtos = reportFeeMonthStatisticsInnerServiceSMOImpl.queryHuaningOweFeeDetail(paramInfo);
- refreshOweFee(reportFeeMonthStatisticsDtos, paramInfo);
+ // refreshOweFee(reportFeeMonthStatisticsDtos, paramInfo);
} else {
reportFeeMonthStatisticsDtos = new ArrayList<>();
}
@@ -992,16 +973,16 @@
}
private void freshReportOweDay(List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsDtos) {
+
+ int day = 0;
for (ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto : reportFeeMonthStatisticsDtos) {
try {
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- int day = DateUtil.daysBetween(DateUtil.getDateFromString(format.format(new Date()), DateUtil.DATE_FORMATE_STRING_A), DateUtil.getDateFromString(reportFeeMonthStatisticsDto.getFeeCreateTime(),
- DateUtil.DATE_FORMATE_STRING_A));
+ day = DateUtil.daysBetween(DateUtil.getDateFromStringA(reportFeeMonthStatisticsDto.getDeadlineTime()),
+ DateUtil.getDateFromStringA(reportFeeMonthStatisticsDto.getFeeCreateTime()));
reportFeeMonthStatisticsDto.setOweDay(day);
} catch (Exception e) {
logger.error("璁＄畻娆犺垂澶╂暟澶辫触", e);
}
-
}
}
--
Gitblit v1.8.0