From fbdea3dc5583399158c39b7b5d4a130bdd402e4a Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 09 八月 2024 16:29:31 +0800
Subject: [PATCH] 2024-08-09 朱宝民 优化代码
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
index 704e2c0..f92bb82 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
@@ -648,9 +648,8 @@
* @return
*/
public QueryResultVo<List<VoDayIntakeAmount>> getDayIntakeAmount(IntakeAmountQO qo) {
- Calendar calendar = Calendar.getInstance();
- Integer year = Optional.ofNullable(qo.getYear()).orElse(calendar.get(Calendar.YEAR));
- Integer month = Optional.ofNullable(qo.getMonth()).orElse(calendar.get(Calendar.MONTH));
+ Integer year = qo.getYearMonth().getYear();
+ Integer month = qo.getYearMonth().getMonthValue();
qo.setYear(year);
qo.setMonth(month);
@@ -702,9 +701,11 @@
* @return
*/
public QueryResultVo<List<VoDayLoss>> getDayLossAmount(IntakeAmountQO qo) {
- Calendar calendar = Calendar.getInstance();
- Integer year = Optional.ofNullable(qo.getYear()).orElse(calendar.get(Calendar.YEAR));
- Integer month = Optional.ofNullable(qo.getMonth()).orElse(calendar.get(Calendar.MONTH));
+ //Calendar calendar = Calendar.getInstance();
+ //Integer year = Optional.ofNullable(qo.getYear()).orElse(calendar.get(Calendar.YEAR));
+ //Integer month = Optional.ofNullable(qo.getMonth()).orElse(calendar.get(Calendar.MONTH));
+ Integer year = qo.getYearMonth().getYear();
+ Integer month = qo.getYearMonth().getMonthValue();
qo.setYear(year);
qo.setMonth(month);
--
Gitblit v1.8.0