From dc6a8ff2eb1dbfc532eac8d296b68e5e05a4a6e7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 17 六月 2024 13:59:27 +0800
Subject: [PATCH] 工时组长权限bug修改
---
performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java | 85 ++++++++++++++++++++++--------------------
1 files changed, 45 insertions(+), 40 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java
index 954addc..d94d359 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java
@@ -18,6 +18,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -61,43 +62,48 @@
String week = auxiliaryWorkingHoursDayDto.getWeek();
auxiliaryWorkingHoursDayDto.setDateTime(null);
auxiliaryWorkingHoursDayDto.setWeek(null);
- Map<String, Object> map = new HashMap<>();
- List<Integer> ids = null;
- map.put("head", PrintChina.printChina(AuxiliaryWorkingHoursDayDto.class));
- //鍒ゆ柇缁勯暱,缁勫憳,绠＄悊鍛樻潈闄�
- Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryWorkingHoursDay");
- User user = userMapper.selectById(map1.get("userId"));
- Integer roleId = user.getRoleId();
- Power power = powerMapper.selectOne(Wrappers.<Power>lambdaQuery().eq(Power::getRoleId, roleId).eq(Power::getMenuMethod, "leader"));
- if (ObjectUtils.isEmpty(power)) {
- //涓嶆槸缁勯暱
- if (map1.get("look") == 1) {
- //鏄粍鍛�
- auxiliaryWorkingHoursDayDto.setNameUser(map1.get("userId"));
- } else {
- //绠＄悊鍛�(涓嶆坊鍔犻檺鍒舵潯浠舵墍鏈変汉閮藉彲浠ョ湅)
- }
+ Map<String, Object> map = new HashMap<>();
+ List<Integer> ids = new ArrayList<>();
+ map.put("head", PrintChina.printChina(AuxiliaryWorkingHoursDayDto.class));
+ //鍒ゆ柇缁勯暱,缁勫憳,绠＄悊鍛樻潈闄�
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryWorkingHoursDay");
+ User user = userMapper.selectById(map1.get("userId"));
+ Integer roleId = user.getRoleId();
+ Power power = powerMapper.selectOne(Wrappers.<Power>lambdaQuery().eq(Power::getRoleId, roleId).eq(Power::getMenuMethod, "leader"));
+ if (ObjectUtils.isEmpty(power)) {
+ //涓嶆槸缁勯暱
+ if (map1.get("look") == 1) {
+ //鏄粍鍛�
+ auxiliaryWorkingHoursDayDto.setNameUser(map1.get("userId"));
} else {
- //鏄粍闀�
- //鏌ヨ缁勫憳
- List<User> users = userMapper.selectList(Wrappers.<User>lambdaQuery().like(User::getDepartLimsId, user.getDepartLimsId()));
- if (ObjectUtils.isNotEmpty(users)) {
- ids = users.stream().map(User::getId).distinct().collect(Collectors.toList());
- }
+ //绠＄悊鍛�(涓嶆坊鍔犻檺鍒舵潯浠舵墍鏈変汉閮藉彲浠ョ湅)
}
- if (ObjectUtils.isNotEmpty(dates)) {
- String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
- if (ObjectUtils.isNotEmpty(week)) {
- String[] weeks = week.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
- map.put("body", auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page,
- QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto)
- .ge("date_time", split[0]).le("date_time", split[1] + " 23:59:59")
- .ge("week", weeks[0]).le("week", weeks[1] ), ids));
- } else {
- map.put("body", auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page, QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto).ge("date_time", split[0]).le("date_time", split[1] + " 23:59:59"), ids));
+ } else {
+ //鏄粍闀�
+ //鏌ヨ缁勫憳
+ List<User> users = userMapper.selectList(Wrappers.<User>lambdaQuery().like(User::getDepartLimsId, user.getDepartLimsId()));
+ if (ObjectUtils.isNotEmpty(users)) {
+ ids.addAll(users.stream().map(User::getId).distinct().collect(Collectors.toList()));
}
}
- else {
+ if (ObjectUtils.isNotEmpty(dates) && ObjectUtils.isNotEmpty(week)) {
+ String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
+ String[] weeks = week.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
+ map.put("body", auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page,
+ QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto)
+ .ge("date_time", split[0]).le("date_time", split[1] + " 23:59:59")
+ .ge("week", weeks[0]).le("week", weeks[1]), ids));
+ } else if (ObjectUtils.isNotEmpty(dates) && ObjectUtils.isEmpty(week)) {
+ String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
+ map.put("body", auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page,
+ QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto)
+ .ge("date_time", split[0]).le("date_time", split[1] + " 23:59:59"), ids));
+ } else if (ObjectUtils.isEmpty(dates) && ObjectUtils.isNotEmpty(week)) {
+ String[] weeks = week.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
+ map.put("body", auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page,
+ QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto)
+ .ge("week", weeks[0]).le("week", weeks[1]), ids));
+ } else {
map.put("body", auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page, QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto), ids));
}
return map;
@@ -127,18 +133,17 @@
//瀹℃牳/鎵瑰噯
@Override
- public int checkOrApprove(Integer id, String state) {
- AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay = auxiliaryWorkingHoursDayMapper.selectById(id);
- auxiliaryWorkingHoursDay.setState(state);
+ public int checkOrApprove(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
+ if (auxiliaryWorkingHoursDay.getState().equals("宸插鏍�")) {
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ auxiliaryWorkingHoursDay.setReviewer(userMapper.selectById(userId).getName());
+ }
return auxiliaryWorkingHoursDayMapper.updateById(auxiliaryWorkingHoursDay);
}
//缂栬緫
@Override
public int updateAuxiliaryWorkingHoursDay(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
- if (!auxiliaryWorkingHoursDay.getState().equals("宸叉彁浜�")) {
- throw new RuntimeException("璇ユ暟鎹凡缁忔壒鍑嗘垨宸插鏍�,鏃犳硶杩涜缂栬緫!");
- }
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
auxiliaryWorkingHoursDay.setNameUser(userId);//濮撳悕id
return auxiliaryWorkingHoursDayMapper.updateById(auxiliaryWorkingHoursDay);
@@ -156,7 +161,7 @@
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
PerformanceShift performanceShift = performanceShiftMapper.selectOne(Wrappers.<PerformanceShift>lambdaQuery().eq(PerformanceShift::getUserId, userId).eq(PerformanceShift::getWorkTime, dateTime));
if (ObjectUtils.isEmpty(performanceShift)) {
- return null;
+ return null;
}
return performanceShift.getShift();
}
--
Gitblit v1.9.3