From ce3d6c415b1bc785635cd552203a99e22207d86d Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期一, 10 三月 2025 14:46:37 +0800
Subject: [PATCH] 绩效管理代码搬迁
---
performance-server/src/main/java/com/ruoyi/performance/service/impl/PerformanceShiftServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/performance-server/src/main/java/com/ruoyi/performance/service/impl/PerformanceShiftServiceImpl.java b/performance-server/src/main/java/com/ruoyi/performance/service/impl/PerformanceShiftServiceImpl.java
index 966317f..5e889d8 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/service/impl/PerformanceShiftServiceImpl.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/service/impl/PerformanceShiftServiceImpl.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.performance.dto.PerformanceShiftAddDto;
import com.ruoyi.performance.dto.PerformanceShiftMapDto;
import com.ruoyi.performance.mapper.PerformanceShiftMapper;
@@ -30,6 +31,7 @@
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -47,6 +49,7 @@
@Autowired
UserMapper userMapper;
+
@Transactional(rollbackFor = Exception.class)
@Override
@@ -133,6 +136,10 @@
@Override
public Map<String, Object> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory) {
+ String laboratoryName = "";
+ if(StringUtils.isNotEmpty(laboratory)) {
+ laboratoryName = baseMapper.selectLaboratory(Integer.parseInt(laboratory));
+ }
//鏌ヨ褰撳墠鐧诲綍浜哄憳鐨勬灦鏋�
Integer userId = SecurityUtils.getUserId().intValue();
//鍒ゆ柇鍏ㄩ儴,涓汉,缁勭粐鐨勬潈闄�
@@ -141,10 +148,10 @@
String departLimsId = user.getDepartLimsId();
if (com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotEmpty(departLimsId) && !departLimsId.equals("")) {
String[] split = departLimsId.split(",");
- //鏌ヨ瀵瑰簲鏋舵瀯鍚嶇О(閫氫俊瀹為獙瀹�,鐢靛姏瀹為獙瀹�,妫�娴嬪姙)
+ //鏌ヨ瀵瑰簲鏋舵瀯鍚嶇О(閫氫俊瀹為獙瀹�,鐢靛姏瀹為獙瀹�,妫�娴嬪姙) 妫�娴嬪姙鐨勫彲浠ュ叏閮ㄦ煡鐪�
String departLims = baseMapper.seldepLimsId(Integer.parseInt(split[split.length - 1]));
- if (departLims.contains("瀹為獙瀹�")) {
- laboratory = departLims;
+ if(departLims.contains("妫�娴嬪姙") || departLims.equals(laboratoryName)) {
+ laboratory = laboratoryName;
}
}
IPage<PerformanceShiftMapDto> mapIPage = baseMapper.performanceShiftPage(page, time, userName, laboratory);
@@ -427,6 +434,11 @@
return map;
}
+ @Override
+ public Map<String, List<Map<String, Object>>> getUserList() {
+ return baseMapper.findUserList().stream().collect(Collectors.groupingBy(m->m.get("depName").toString()));
+ }
+
// 鑾峰彇涓や釜localDateTime鐨勬瘡涓�澶�
public static List<LocalDateTime> getLocalDateTimesBetween(LocalDateTime start, LocalDateTime end) {
List<LocalDateTime> localDateTimes = new ArrayList<>();
--
Gitblit v1.9.3