From 664f02f7f00e475508ea088c588739373700b436 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 18 七月 2024 20:53:49 +0800
Subject: [PATCH] 费用统计更改+工时+检验查看权限
---
performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java
index ee1d698..e85943f 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java
@@ -5,6 +5,7 @@
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -97,22 +98,38 @@
if (ObjectUtils.isNotEmpty(dates) && ObjectUtils.isNotEmpty(week)) {
String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
String[] weeks = week.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
- map.put("body", auxiliaryOutputWorkingHoursMapper.selectAuxiliaryOutputWorkingHours(page,
+ IPage<AuxiliaryOutputWorkingHoursDto> auxiliaryOutputWorkingHoursDtoIPage = auxiliaryOutputWorkingHoursMapper.selectAuxiliaryOutputWorkingHours(page,
QueryWrappers.queryWrappers(auxiliaryOutputWorkingHoursDto)
.ge("date_time", split[0]).le("date_time", split[1] + " 23:59:59")
- .ge("week", weeks[0]).le("week", weeks[1]), ids));
+ .ge("week", weeks[0]).le("week", weeks[1]), ids);
+ for (AuxiliaryOutputWorkingHoursDto record : auxiliaryOutputWorkingHoursDtoIPage.getRecords()) {
+ record.setDateTime(record.getDateTime().substring(0,10));
+ }
+ map.put("body",auxiliaryOutputWorkingHoursDtoIPage );
} else if (ObjectUtils.isNotEmpty(dates) && ObjectUtils.isEmpty(week)) {
String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
- map.put("body", auxiliaryOutputWorkingHoursMapper.selectAuxiliaryOutputWorkingHours(page,
+ IPage<AuxiliaryOutputWorkingHoursDto> auxiliaryOutputWorkingHoursDtoIPage = auxiliaryOutputWorkingHoursMapper.selectAuxiliaryOutputWorkingHours(page,
QueryWrappers.queryWrappers(auxiliaryOutputWorkingHoursDto)
- .ge("date_time", split[0]).le("date_time", split[1] + " 23:59:59"), ids));
+ .ge("date_time", split[0]).le("date_time", split[1] + " 23:59:59"), ids);
+ for (AuxiliaryOutputWorkingHoursDto record : auxiliaryOutputWorkingHoursDtoIPage.getRecords()) {
+ record.setDateTime(record.getDateTime().substring(0,10));
+ }
+ map.put("body",auxiliaryOutputWorkingHoursDtoIPage );
} else if (ObjectUtils.isEmpty(dates) && ObjectUtils.isNotEmpty(week)) {
String[] weeks = week.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
- map.put("body", auxiliaryOutputWorkingHoursMapper.selectAuxiliaryOutputWorkingHours(page,
+ IPage<AuxiliaryOutputWorkingHoursDto> auxiliaryOutputWorkingHoursDtoIPage = auxiliaryOutputWorkingHoursMapper.selectAuxiliaryOutputWorkingHours(page,
QueryWrappers.queryWrappers(auxiliaryOutputWorkingHoursDto)
- .ge("week", weeks[0]).le("week", weeks[1]), ids));
+ .ge("week", weeks[0]).le("week", weeks[1]), ids);
+ for (AuxiliaryOutputWorkingHoursDto record : auxiliaryOutputWorkingHoursDtoIPage.getRecords()) {
+ record.setDateTime(record.getDateTime().substring(0,10));
+ }
+ map.put("body", auxiliaryOutputWorkingHoursDtoIPage);
} else {
- map.put("body", auxiliaryOutputWorkingHoursMapper.selectAuxiliaryOutputWorkingHours(page, QueryWrappers.queryWrappers(auxiliaryOutputWorkingHoursDto), ids));
+ IPage<AuxiliaryOutputWorkingHoursDto> auxiliaryOutputWorkingHoursDtoIPage = auxiliaryOutputWorkingHoursMapper.selectAuxiliaryOutputWorkingHours(page, QueryWrappers.queryWrappers(auxiliaryOutputWorkingHoursDto), ids);
+ for (AuxiliaryOutputWorkingHoursDto record : auxiliaryOutputWorkingHoursDtoIPage.getRecords()) {
+ record.setDateTime(record.getDateTime().substring(0,10));
+ }
+ map.put("body", auxiliaryOutputWorkingHoursDtoIPage);
}
return map;
}
@@ -122,17 +139,21 @@
public Map<String, Object> collectWorkingHours(AuxiliaryOutputWorkingHoursDto auxiliaryOutputWorkingHoursDto) {
AuxiliaryOutputWorkingHours outputWorkingHours = new AuxiliaryOutputWorkingHours();
AuxiliaryWorkingHoursDay workingHoursDay = new AuxiliaryWorkingHoursDay();
+ List<Integer> ids = new ArrayList<>();
+ if (ObjectUtils.isNotEmpty(auxiliaryOutputWorkingHoursDto.getWeekDay())){
+ outputWorkingHours.setWeekDay(auxiliaryOutputWorkingHoursDto.getWeekDay());
+ workingHoursDay.setWeekDay(auxiliaryOutputWorkingHoursDto.getWeekDay());
+ }
if (ObjectUtils.isNotEmpty(auxiliaryOutputWorkingHoursDto.getName())){
- User user = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getName, auxiliaryOutputWorkingHoursDto.getName()));
- outputWorkingHours.setCheck(user.getId());
- workingHoursDay.setNameUser(user.getId());
+ List<User> user = userMapper.selectList(Wrappers.<User>lambdaQuery().like(User::getName, auxiliaryOutputWorkingHoursDto.getName()));
+ ids.addAll(user.stream().map(User::getId).collect(Collectors.toList()));
}
String dates = auxiliaryOutputWorkingHoursDto.getDateTime();
auxiliaryOutputWorkingHoursDto.setDateTime(null);
Map<String, Object> map = new HashMap<>();
Double sumOutputWorkTime = 0.0;
Double sumApprovedWorkingHour = 0.0;
- List<Integer> ids = null;
+
//鍒ゆ柇鏄粍闀胯繕鏄粍鍛樿繕鏄鐞嗗憳
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryOutputWorkingHours");
User user = userMapper.selectById(map1.get("userId"));
@@ -156,6 +177,9 @@
}
List<AuxiliaryOutputWorkingHours> auxiliaryOutputWorkingHours = new ArrayList<>();
List<AuxiliaryWorkingHoursDay> auxiliaryWorkingHoursDays = new ArrayList<>();
+ if (ids.size() == 0) {
+ ids=null;
+ }
if (ObjectUtils.isNotEmpty(dates)) {
String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
//缁熻褰撳墠鐢ㄦ埛鐨勪骇鍝佸伐鏃�
@@ -167,7 +191,13 @@
.eq("state","宸叉壒鍑�")
.ge("date_time", split[0])
.le("date_time", split[1] + " 23:59:59"),ids);
- } else {
+ }else if (ObjectUtils.isNotEmpty(auxiliaryOutputWorkingHoursDto.getWeekDay())){
+ //缁熻褰撳墠鐢ㄦ埛鐨勪骇鍝佸伐鏃�
+ auxiliaryOutputWorkingHours = auxiliaryOutputWorkingHoursMapper.selectLists(QueryWrappers.queryWrappers(outputWorkingHours),ids);
+ //缁熻褰撳墠鐢ㄦ埛鐨勮緟鍔╁伐鏃�
+ auxiliaryWorkingHoursDays = auxiliaryWorkingHoursDayMapper.selectLists(QueryWrappers.queryWrappers(workingHoursDay).eq("state","宸叉壒鍑�"),ids);
+ }
+ else {
auxiliaryOutputWorkingHours = auxiliaryOutputWorkingHoursMapper.selectListByIds(ids);
auxiliaryWorkingHoursDays = auxiliaryWorkingHoursDayMapper.selectListByIds(ids);
}
--
Gitblit v1.9.3