From 5391f63030fcbe98efb711ba9fdd394b17d0f36e Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 25 十二月 2024 20:52:02 +0800
Subject: [PATCH] edit MpOpenId
---
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java | 33 +++------------------------------
1 files changed, 3 insertions(+), 30 deletions(-)
diff --git a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java
index 7fd3d85..366d9d3 100644
--- a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java
+++ b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java
@@ -122,7 +122,7 @@
public List<JSONObject> queryPlanList() {
List<JSONObject> list = assemblyPlanDao.queryPlanList();
- Map<String, JSONObject> map = new ConcurrentHashMap<>(); // 浣跨敤骞跺彂瀹夊叏鐨凪ap
+ /*Map<String, JSONObject> map = new ConcurrentHashMap<>(); // 浣跨敤骞跺彂瀹夊叏鐨凪ap
for (JSONObject item : list) {
String planId = String.valueOf(item.getObj("planId"));
JSONObject innerObject = new JSONObject()
@@ -141,34 +141,7 @@
map.put(planId, outObject);
}
}
- return map.values().stream().collect(Collectors.toList());
+ return map.values().stream().collect(Collectors.toList());*/
+ return list;
}
-
- public void test() {
-
- //OthStatisticWorkloadMapper workloadMapper = SpringContextUtil.getBean(OthStatisticWorkloadMapper.class);
- //鎵惧埌鏈�澶т竴鏉℃棩鏈熻褰�
- Date maxDate = workloadDao.selectMaxDate();
- //寰�鍚庡惊鐜ぉ鏁版眹鎬�
- if (maxDate != null) {
- //寰幆缁熻
- LocalDate firstDay = maxDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
- LocalDate today = LocalDate.now();
- LocalDate nextDate = firstDay.plusDays(1);
- //today 瑕佺粺璁� firstday涓嶇粺璁�
- long daysBetween = ChronoUnit.DAYS.between(firstDay, today);
- if (daysBetween > 30) {
- daysBetween = 30;
- nextDate = firstDay.plusDays(daysBetween);
- }
- for (int i = 1; i <= daysBetween; i++) {
- Date startDt = Date.from(LocalDateTime.of(nextDate, LocalTime.of(0, 0, 0)).atZone(ZoneId.systemDefault()).toInstant());
- Date endDt = Date.from(LocalDateTime.of(nextDate, LocalTime.of(23, 59, 59)).atZone(ZoneId.systemDefault()).toInstant());
- workloadDao.insertBatch(startDt, endDt);
- nextDate = firstDay.plusDays(i);
- }
- }
- }
-
-
}
--
Gitblit v1.8.0