From 525c64ef476b367b3ded1b9205788a183c2e810b Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 09 五月 2024 13:16:44 +0800
Subject: [PATCH] 2024-5-9 绩效管理-班次后端开发调整完成
---
performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java | 102 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 85 insertions(+), 17 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 fcd6b5c..0b49c0c 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
@@ -1,10 +1,13 @@
package com.yuanchu.mom.service.impl;
+import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.dto.PerformanceShiftAddDto;
+import com.yuanchu.mom.dto.PerformanceShiftMapDto;
import com.yuanchu.mom.mapper.PerformanceShiftMapper;
import com.yuanchu.mom.pojo.Enums;
import com.yuanchu.mom.pojo.PerformanceShift;
@@ -12,10 +15,13 @@
import com.yuanchu.mom.service.PerformanceShiftService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
import java.util.*;
/**
@@ -32,27 +38,65 @@
@Autowired
private EnumService enumService;
+ public List<PerformanceShift> list = new ArrayList<>();
+
+ @Transactional(rollbackFor = Exception.class)
@Override
public void performanceShiftAdd(PerformanceShiftAddDto performanceShiftAddDto) {
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ String formattedDateTime = performanceShiftAddDto.getStartWeek().format(formatter);
+ String[] splitUserId = performanceShiftAddDto.getUserId().split(",");
+ for (String userId : splitUserId) {
+ boolean exists = baseMapper.exists(Wrappers.<PerformanceShift>lambdaQuery()
+ .eq(PerformanceShift::getWorkTime, formattedDateTime)
+ .eq(PerformanceShift::getUserId, userId));
+ // 濡傛灉涓嶅瓨鍦ㄦ坊鍔犳暟鎹�
+ if (!exists) {
+ LocalDate firstDayOfMonth = performanceShiftAddDto.getEndWeek().toLocalDate().withDayOfMonth(1);
+ LocalDate lastDayOfMonth = performanceShiftAddDto.getEndWeek().toLocalDate().with(TemporalAdjusters.lastDayOfMonth());
+ List<LocalDateTime> localDateTimesBetween = getLocalDateTimesBetween(firstDayOfMonth.atStartOfDay(), lastDayOfMonth.atStartOfDay());
+ localDateTimesBetween.forEach(i -> {
+ for (String s : splitUserId) {
+ PerformanceShift performanceShift = new PerformanceShift();
+ performanceShift.setUserId(Integer.valueOf(s));
+ performanceShift.setWorkTime(i);
+ performanceShift.setShift("");
+ list.add(performanceShift);
+ }
+ if (list.size() >= 1000) {
+ baseMapper.insertBatchSomeColumn(list);
+ list.clear();
+ }
+ });
+ if (!list.isEmpty()) {
+ baseMapper.insertBatchSomeColumn(list);
+ }
+ }
+ }
+ // 鍐嶆鏇存柊
List<LocalDateTime> datesBetween = getLocalDateTimesBetween(performanceShiftAddDto.getStartWeek(), performanceShiftAddDto.getEndWeek());
for (LocalDateTime date : datesBetween) {
- 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);
+ String formatterDateTime = date.format(formatter);
+ baseMapper.update(new PerformanceShift(), Wrappers.<PerformanceShift>lambdaUpdate()
+ .set(PerformanceShift::getShift, performanceShiftAddDto.getShift())
+ .eq(PerformanceShift::getUserId, s)
+ .eq(PerformanceShift::getWorkTime, formatterDateTime));
}
}
}
@Override
- 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);
+ public IPage<PerformanceShiftMapDto> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory) {
+ IPage<PerformanceShiftMapDto> 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(";");
+ List<Map<String, Object>> mapYearIPage = baseMapper.performanceShiftYearPage(time, userName, laboratory);
+ mapIPage.getRecords().forEach(i -> {
+ String[] shiftTimes = i.getShiftTime().split(";");
int totalAttendance = 0;
List<Object> map = new ArrayList<>();
// 鍒嗗壊鏃ユ湡
@@ -60,25 +104,47 @@
Map<Object, Object> hashMap = new HashMap<>();
String[] shiftTimeAndShift = shiftTime.split("锛�");
for (Enums enums : shiftType) {
- int num = 0;
+ if (!i.getMonthlyAttendance().containsKey(enums.getLabel())) {
+ i.getMonthlyAttendance().put(enums.getLabel(), 0);
+ }
if (enums.getValue().equals(shiftTimeAndShift[1])) {
- num++;
+ Integer num = (Integer) i.getMonthlyAttendance().get(enums.getLabel());
+ i.getMonthlyAttendance().put(enums.getLabel(), num += 1);
}
- i.put(enums.getLabel(), num);
- if (!enums.getValue().equals("3") && !enums.getValue().equals("4")) {
- i.put("totalAttendance", totalAttendance += num);
- }
+ }
+ if (shiftTimeAndShift[1].equals("1") || shiftTimeAndShift[1].equals("2") || shiftTimeAndShift[1].equals("0")) {
+ i.getMonthlyAttendance().put("totalAttendance", totalAttendance += 1);
}
hashMap.put("id", shiftTimeAndShift[2]);
hashMap.put("shift", shiftTimeAndShift[1]);
- hashMap.put("weekly", DateUtil.weekOfYear(DateUtil.parse(shiftTimeAndShift[0])));
+ 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);
}
- i.put("list", map);
- i.remove("shiftTime");
- }
+ int totalYearAttendance = 0;
+ Map<String, Object> hashMap = new HashMap<>();
+ for (Map<String, Object> record : mapYearIPage) {
+ if (record.get("user_id").toString().equals(i.getUserId())) {
+ for (Enums enums : shiftType) {
+ if (!hashMap.containsKey(enums.getLabel())) {
+ hashMap.put(enums.getLabel(), 0);
+ }
+ if (enums.getValue().equals(record.get("shift"))) {
+ Integer num = (Integer) hashMap.get(enums.getLabel());
+ hashMap.put(enums.getLabel(), num += 1);
+ }
+ }
+ if (record.get("shift").equals("1") || record.get("shift").equals("2") || record.get("shift").equals("0")) {
+ hashMap.put("totalAttendance", totalYearAttendance += 1);
+ }
+ }
+ }
+ i.setSidebarAnnualAttendance(hashMap);
+ i.setList(map);
+ i.setShiftTime(null);
+ });
return mapIPage;
}
@@ -87,7 +153,9 @@
PerformanceShift performanceShift = new PerformanceShift();
performanceShift.setId(id);
performanceShift.setShift(shift);
- baseMapper.updateById(performanceShift);
+ baseMapper.update(new PerformanceShift(), Wrappers.<PerformanceShift>lambdaUpdate()
+ .eq(PerformanceShift::getId, id)
+ .set(PerformanceShift::getShift, shift));
}
// 鑾峰彇涓や釜localDateTime鐨勬瘡涓�澶�
--
Gitblit v1.9.3