From 907e38b9b4079d29a8b63778226f723528f0053f Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 08 五月 2024 17:36:34 +0800
Subject: [PATCH] 2024-5-8 绩效管理-班次后端开发完成
---
performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java | 4 +-
performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml | 2
performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java | 56 ++++++++++++++++++++++++----
3 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java b/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java
index e126761..e923efa 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java
@@ -1,8 +1,8 @@
package com.yuanchu.mom.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.mybatis_config.MyBaseMapper;
import com.yuanchu.mom.pojo.PerformanceShift;
import org.springframework.data.repository.query.Param;
@@ -16,7 +16,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2024-05-08 09:12:04
*/
-public interface PerformanceShiftMapper extends BaseMapper<PerformanceShift> {
+public interface PerformanceShiftMapper extends MyBaseMapper<PerformanceShift> {
IPage<Map<String, Object>> performanceShiftPage(
Page<Object> page,
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..b69566d 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
@@ -2,6 +2,7 @@
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;
@@ -12,10 +13,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,17 +36,51 @@
@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);
+ boolean exists = baseMapper.exists(Wrappers.<PerformanceShift>lambdaQuery()
+ .eq(PerformanceShift::getWorkTime, formattedDateTime));
+ String[] splitUserId = performanceShiftAddDto.getUserId().split(",");
+ // 濡傛灉涓嶅瓨鍦ㄦ坊鍔犳暟鎹�
+ 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));
}
}
}
@@ -60,14 +98,16 @@
Map<Object, Object> hashMap = new HashMap<>();
String[] shiftTimeAndShift = shiftTime.split("锛�");
for (Enums enums : shiftType) {
- int num = 0;
+ if (!i.containsKey(enums.getLabel())) {
+ i.put(enums.getLabel(), 0);
+ }
if (enums.getValue().equals(shiftTimeAndShift[1])) {
- num++;
+ Integer num = (Integer) i.get(enums.getLabel());
+ i.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.put("totalAttendance", totalAttendance += 1);
}
hashMap.put("id", shiftTimeAndShift[2]);
hashMap.put("shift", shiftTimeAndShift[1]);
diff --git a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
index cc7e1d4..d903fed 100644
--- a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
+++ b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
@@ -5,7 +5,7 @@
<select id="performanceShiftPage" resultType="map">
SELECT
if(u.department is not null and u.department != '', CONCAT(u.name, '锛�', u.department, '锛�'), u.name) name,
- GROUP_CONCAT(s.work_time, '锛�', s.shift, '锛�', s.id SEPARATOR ';') AS shiftTime
+ GROUP_CONCAT(s.work_time, '锛�', s.shift, '锛�', s.id order by s.work_time SEPARATOR ';') AS shiftTime
FROM performance_shift s
LEFT JOIN user u on u.id = s.user_id
<where>
--
Gitblit v1.9.3