From e42b239ac2c2a922172badbe32afaa4ba4f615f8 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 14 四月 2025 20:17:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/impl/LargenScreenServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/impl/LargenScreenServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/impl/LargenScreenServiceImpl.java
index 5df6c32..1e0505a 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/impl/LargenScreenServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/impl/LargenScreenServiceImpl.java
@@ -11,6 +11,7 @@
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -37,14 +38,16 @@
}
@Override
- public DailyProductionVO querySameDayProduction(DateRequest query) {
+ public List<DailyProductionVO> querySameDayProduction(DateRequest query) {
if (StringUtils.isEmpty(query.getBeginDate())) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- query.setBeginDate(sdf.format(new Date()));
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DAY_OF_MONTH, -6);
+ query.setBeginDate(sdf.format(calendar.getTime()));
query.setEndDate(sdf.format(new Date()));
}
List<DailyProductionVO> list = largenScreenMapper.queryDailyProduction(query.getBeginDate(), query.getEndDate());
- return list.get(0);
+ return list;
}
--
Gitblit v1.8.0