From 1e567af8bbdda31ce3342cd41bb40157168b3da9 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 28 八月 2024 17:27:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientSv.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientSv.java
index 458abc2..d339094 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientSv.java
@@ -13,6 +13,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Calendar;
@@ -342,9 +344,13 @@
* @param qo
* @return
*/
- public QueryResultVo<List<VoDayClient>> getDayAmountAndMoney(ClientAmountQO qo) {
- Integer year = qo.getYearMonth().getYear();
- Integer month = qo.getYearMonth().getMonthValue();
+ public QueryResultVo<List<VoDayClient>> getDayAmountAndMoney(ClientAmountQO qo) throws ParseException {
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ String yearMonth = qo.getYearMonth();
+ yearMonth = yearMonth + "-01";
+ yearMonth = dateFormat.format(dateFormat.parse(yearMonth));
+ Integer year = Integer.parseInt(yearMonth.substring(0,4));
+ Integer month = Integer.parseInt(yearMonth.substring(5,7));
qo.setYear(year);
qo.setMonth(month);
--
Gitblit v1.8.0