From 40c75db6d335a0335e944e5196a102d8837cad6b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 15 七月 2024 21:00:28 +0800
Subject: [PATCH] 工时bug修改+光纤接头损耗报告完成
---
performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 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 8b9fb60..753a514 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
@@ -28,6 +28,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -66,7 +67,7 @@
auxiliaryOutputWorkingHoursDto.setDateTime(null);
auxiliaryOutputWorkingHoursDto.setWeek(null);
Map<String, Object> map = new HashMap<>();
- List<Integer> ids = null;
+ List<Integer> ids = new ArrayList<>();
map.put("head", PrintChina.printChina(AuxiliaryOutputWorkingHoursDto.class));
//鍒ゆ柇缁勯暱,缁勫憳,绠＄悊鍛樻潈闄�
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryOutputWorkingHours");
@@ -86,20 +87,30 @@
//鏌ヨ缁勯暱涓嬬殑缁勫憳
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());
+ ids.addAll(users.stream().map(User::getId).distinct().collect(Collectors.toList()));
}
}
- if (ObjectUtils.isNotEmpty(dates)) {
+ if (ids.size()==0){
+ ids=null;
+ }
+ if (ObjectUtils.isNotEmpty(dates) && ObjectUtils.isNotEmpty(week)){
String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
- if (ObjectUtils.isNotEmpty(week)){
- String[] weeks = week.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
- map.put("body", 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));
- }
- map.put("body", auxiliaryOutputWorkingHoursMapper.selectAuxiliaryOutputWorkingHours(page, QueryWrappers.queryWrappers(auxiliaryOutputWorkingHoursDto).ge("date_time", split[0]).le("date_time", split[1] + " 23:59:59"), ids));
- } else {
+ String[] weeks = week.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
+ map.put("body", 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));
+ }else if(ObjectUtils.isNotEmpty(dates) && ObjectUtils.isEmpty(week)){
+ String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
+ map.put("body", auxiliaryOutputWorkingHoursMapper.selectAuxiliaryOutputWorkingHours(page,
+ QueryWrappers.queryWrappers(auxiliaryOutputWorkingHoursDto)
+ .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", auxiliaryOutputWorkingHoursMapper.selectAuxiliaryOutputWorkingHours(page,
+ QueryWrappers.queryWrappers(auxiliaryOutputWorkingHoursDto)
+ .ge("week", weeks[0]).le("week", weeks[1]), ids));
+ }else {
map.put("body", auxiliaryOutputWorkingHoursMapper.selectAuxiliaryOutputWorkingHours(page, QueryWrappers.queryWrappers(auxiliaryOutputWorkingHoursDto), ids));
}
return map;
@@ -159,9 +170,9 @@
//瀵煎嚭
@Override
public void exportWorkingHours(HttpServletResponse response) throws IOException {
- List<AuxiliaryOutputWorkingHoursDto> auxiliaryOutputWorkingHoursDtos = null;
- List<AuxiliaryWorkingHoursDayDto> auxiliaryWorkingHoursDayDtos = null;
- List<Integer> ids = null;
+ List<AuxiliaryOutputWorkingHoursDto> auxiliaryOutputWorkingHoursDtos = new ArrayList<>();
+ List<AuxiliaryWorkingHoursDayDto> auxiliaryWorkingHoursDayDtos = new ArrayList<>();
+ List<Integer> ids = new ArrayList<>();
//鍒ゆ柇鏄粍闀胯繕鏄粍鍛樿繕鏄鐞嗗憳
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryOutputWorkingHours");
User user = userMapper.selectById(map1.get("userId"));
@@ -191,7 +202,7 @@
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("UTF-8");
// 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
- String fileName = URLEncoder.encode("宸ユ椂绠＄悊瀵煎嚭", "UTF-8");
+ String fileName = URLEncoder.encode("鏃ュ伐鏃剁鐞嗗鍑�", "UTF-8");
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
try {
// 鏂板缓ExcelWriter
--
Gitblit v1.9.3