From 0d6aae2036feb77bb2796f6b484489d7ffcd99c2 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 10 五月 2024 22:19:25 +0800
Subject: [PATCH] 各bug修复
---
performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java
index 0b49c0c..fd33f86 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java
@@ -91,7 +91,7 @@
}
@Override
- public IPage<PerformanceShiftMapDto> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory) {
+ public Map<String, Object> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory) {
IPage<PerformanceShiftMapDto> mapIPage = baseMapper.performanceShiftPage(page, time, userName, laboratory);
List<Enums> shiftType = enumService.selectEnumByCategory("鐝绫诲瀷");
List<Map<String, Object>> mapYearIPage = baseMapper.performanceShiftYearPage(time, userName, laboratory);
@@ -117,10 +117,7 @@
}
hashMap.put("id", shiftTimeAndShift[2]);
hashMap.put("shift", shiftTimeAndShift[1]);
- DateTime parse = DateUtil.parse(shiftTimeAndShift[0]);
- hashMap.put("weekly", DateUtil.weekOfYear(DateUtil.offsetDay(parse, 1)));
hashMap.put("time", shiftTimeAndShift[0]);
- hashMap.put("headerTime", getWeek(shiftTimeAndShift[0]));
map.add(hashMap);
}
int totalYearAttendance = 0;
@@ -145,19 +142,46 @@
i.setList(map);
i.setShiftTime(null);
});
- return mapIPage;
+ // 鑾峰彇header鏃堕棿
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ DateTimeFormatter formatters = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ // 灏嗗瓧绗︿覆鏃堕棿杞崲涓� LocalDateTime 绫诲瀷鏃堕棿
+ LocalDateTime localDateTime = LocalDateTime.parse(time, formatters);
+ LocalDate firstDayOfMonth = localDateTime.toLocalDate().withDayOfMonth(1);
+ LocalDate lastDayOfMonth = localDateTime.toLocalDate().with(TemporalAdjusters.lastDayOfMonth());
+ List<LocalDateTime> localDateTimesBetween = getLocalDateTimesBetween(firstDayOfMonth.atStartOfDay(), lastDayOfMonth.atStartOfDay());
+ List<Object> list1 = new ArrayList<>();
+ for (LocalDateTime dateTime : localDateTimesBetween) {
+ Map<Object, Object> hashMap = new HashMap<>();
+ DateTime parse = DateUtil.parse(dateTime.format(formatter));
+ hashMap.put("weekly", DateUtil.weekOfYear(DateUtil.offsetDay(parse, 1)));
+ hashMap.put("headerTime", getWeek(dateTime.format(formatters)));
+ list1.add(hashMap);
+ }
+ Map<String, Object> resultMap = new HashMap<>();
+ resultMap.put("page", mapIPage);
+ resultMap.put("headerList", list1);
+ return resultMap;
}
@Override
- public void performanceShiftUpdate(String shift, Integer id) {
- PerformanceShift performanceShift = new PerformanceShift();
- performanceShift.setId(id);
- performanceShift.setShift(shift);
+ public void performanceShiftUpdate(PerformanceShift performanceShift) {
baseMapper.update(new PerformanceShift(), Wrappers.<PerformanceShift>lambdaUpdate()
- .eq(PerformanceShift::getId, id)
- .set(PerformanceShift::getShift, shift));
+ .eq(PerformanceShift::getId, performanceShift.getId())
+ .set(PerformanceShift::getShift, performanceShift.getShift()));
}
+// public static void main(String[] args) {
+// String dateStr = "2023-09-15 12:30:45";
+// LocalDateTime localDateTime = convertToLocalDateTime(dateStr);
+// System.out.println(localDateTime);
+// }
+//
+// public static LocalDateTime convertToLocalDateTime(String dateStr) {
+// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+// return LocalDateTime.parse(dateStr, formatter);
+// }
+
// 鑾峰彇涓や釜localDateTime鐨勬瘡涓�澶�
public static List<LocalDateTime> getLocalDateTimesBetween(LocalDateTime start, LocalDateTime end) {
List<LocalDateTime> localDateTimes = new ArrayList<>();
--
Gitblit v1.9.3