From 2e770d5ad27afd5cec0ea8759ca37504a883b42f Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 08 五月 2024 14:50:25 +0800
Subject: [PATCH] 2024-5-8 绩效管理-班次后端开发完成
---
performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 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 2087610..fcd6b5c 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
@@ -36,46 +36,48 @@
public void performanceShiftAdd(PerformanceShiftAddDto performanceShiftAddDto) {
List<LocalDateTime> datesBetween = getLocalDateTimesBetween(performanceShiftAddDto.getStartWeek(), performanceShiftAddDto.getEndWeek());
for (LocalDateTime date : datesBetween) {
- PerformanceShift performanceShift = new PerformanceShift();
- performanceShift.setShift(performanceShiftAddDto.getShift());
- performanceShift.setUserId(performanceShiftAddDto.getUserId());
- performanceShift.setWorkTime(date);
- baseMapper.insert(performanceShift);
+ String[] splitUserId = performanceShiftAddDto.getUserId().split(",");
+ for (String s : splitUserId) {
+ PerformanceShift performanceShift = new PerformanceShift();
+ performanceShift.setShift(performanceShiftAddDto.getShift());
+ performanceShift.setUserId(Integer.valueOf(s));
+ performanceShift.setWorkTime(date);
+ baseMapper.insert(performanceShift);
+ }
}
}
@Override
- public IPage<Map<String, Object>> performanceShiftPage(Page<Object> page, LocalDateTime time, String userName, String laboratory) {
+ public IPage<Map<String, Object>> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory) {
IPage<Map<String, Object>> mapIPage = baseMapper.performanceShiftPage(page, time, userName, laboratory);
List<Enums> shiftType = enumService.selectEnumByCategory("鐝绫诲瀷");
for (Map<String, Object> i : mapIPage.getRecords()) {
String[] shiftTimes = i.get("shiftTime").toString().split(";");
int totalAttendance = 0;
- Map<Object, Object> map = new HashMap<>();
- for (Enums enums : shiftType) {
- Integer num = 0;
- // 鍒嗗壊鏃ユ湡
- for (String shiftTime : shiftTimes) {
- Map<Object, Object> hashMap = new HashMap<>();
- String[] shiftTimeAndShift = shiftTime.split("锛�");
+ List<Object> map = new ArrayList<>();
+ // 鍒嗗壊鏃ユ湡
+ for (String shiftTime : shiftTimes) {
+ Map<Object, Object> hashMap = new HashMap<>();
+ String[] shiftTimeAndShift = shiftTime.split("锛�");
+ for (Enums enums : shiftType) {
+ int num = 0;
if (enums.getValue().equals(shiftTimeAndShift[1])) {
num++;
}
- // 3锛氫紤鍋囷紱4锛氳鍋�
- if (!enums.getValue().equals("3") && enums.getValue().equals("4")) {
- totalAttendance++;
+ i.put(enums.getLabel(), num);
+ if (!enums.getValue().equals("3") && !enums.getValue().equals("4")) {
+ i.put("totalAttendance", totalAttendance += num);
}
- hashMap.put("id", shiftTimeAndShift[2]);
- hashMap.put("shift", shiftTimeAndShift[1]);
- hashMap.put("weekly", DateUtil.weekOfYear(DateUtil.parse(shiftTimeAndShift[0])));
- hashMap.put("time", shiftTimeAndShift[0]);
- map.put(getWeek(shiftTimeAndShift[0]), hashMap);
}
- i.put(enums.getLabel(), num);
- i.put("list", map);
- i.put("totalAttendance", totalAttendance);
- i.remove("shiftTime");
+ hashMap.put("id", shiftTimeAndShift[2]);
+ hashMap.put("shift", shiftTimeAndShift[1]);
+ hashMap.put("weekly", DateUtil.weekOfYear(DateUtil.parse(shiftTimeAndShift[0])));
+ hashMap.put("time", shiftTimeAndShift[0]);
+ hashMap.put("headerTime", getWeek(shiftTimeAndShift[0]));
+ map.add(hashMap);
}
+ i.put("list", map);
+ i.remove("shiftTime");
}
return mapIPage;
}
--
Gitblit v1.9.3