From 36ccc814cb2499757a0cfd5525d5e8d0c2309b64 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 27 十一月 2024 16:02:42 +0800
Subject: [PATCH] 企业微信的消息提醒的信息改成单号样品名+检验下单的模版保存,如果存在同名的情况,将原有的情况覆盖掉,并添加提示框+首页展示添加样品名称
---
performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 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 326ae57..80dcba5 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
@@ -7,6 +7,7 @@
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.AuxiliaryWorkingHoursDayDto;
+import com.yuanchu.mom.dto.HoursDay;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
@@ -87,8 +88,8 @@
ids.addAll(users.stream().map(User::getId).distinct().collect(Collectors.toList()));
}
}
- if (ids.size()==0){
- ids=null;
+ if (ids.size() == 0) {
+ ids = null;
}
if (ObjectUtils.isNotEmpty(dates) && ObjectUtils.isNotEmpty(week)) {
String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
@@ -98,7 +99,7 @@
.ge("date_time", split[0]).le("date_time", split[1] + " 23:59:59")
.ge("week", weeks[0]).le("week", weeks[1]), ids);
for (AuxiliaryWorkingHoursDayDto record : auxiliaryWorkingHoursDayDtoIPage.getRecords()) {
- record.setDateTime(record.getDateTime().substring(0,10));
+ record.setDateTime(record.getDateTime().substring(0, 10));
}
map.put("body", auxiliaryWorkingHoursDayDtoIPage);
} else if (ObjectUtils.isNotEmpty(dates) && ObjectUtils.isEmpty(week)) {
@@ -107,22 +108,22 @@
QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto)
.ge("date_time", split[0]).le("date_time", split[1] + " 23:59:59"), ids);
for (AuxiliaryWorkingHoursDayDto record : auxiliaryWorkingHoursDayDtoIPage.getRecords()) {
- record.setDateTime(record.getDateTime().substring(0,10));
+ record.setDateTime(record.getDateTime().substring(0, 10));
}
- map.put("body",auxiliaryWorkingHoursDayDtoIPage );
+ map.put("body", auxiliaryWorkingHoursDayDtoIPage);
} else if (ObjectUtils.isEmpty(dates) && ObjectUtils.isNotEmpty(week)) {
String[] weeks = week.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
IPage<AuxiliaryWorkingHoursDayDto> auxiliaryWorkingHoursDayDtoIPage = auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page,
QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto)
.ge("week", weeks[0]).le("week", weeks[1]), ids);
for (AuxiliaryWorkingHoursDayDto record : auxiliaryWorkingHoursDayDtoIPage.getRecords()) {
- record.setDateTime(record.getDateTime().substring(0,10));
+ record.setDateTime(record.getDateTime().substring(0, 10));
}
map.put("body", auxiliaryWorkingHoursDayDtoIPage);
} else {
IPage<AuxiliaryWorkingHoursDayDto> auxiliaryWorkingHoursDayDtoIPage = auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page, QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto), ids);
for (AuxiliaryWorkingHoursDayDto record : auxiliaryWorkingHoursDayDtoIPage.getRecords()) {
- record.setDateTime(record.getDateTime().substring(0,10));
+ record.setDateTime(record.getDateTime().substring(0, 10));
}
map.put("body", auxiliaryWorkingHoursDayDtoIPage);
}
@@ -153,12 +154,20 @@
//瀹℃牳/鎵瑰噯
@Override
- public int checkOrApprove(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
- if (auxiliaryWorkingHoursDay.getState().equals("宸插鏍�")) {
- Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
- auxiliaryWorkingHoursDay.setReviewer(userMapper.selectById(userId).getName());
+ public boolean checkOrApprove(HoursDay hoursDay) {
+ List<AuxiliaryWorkingHoursDay> auxiliaryWorkingHoursDays = hoursDay.getAuxiliaryWorkingHoursDays();
+ for (AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay : auxiliaryWorkingHoursDays) {
+ if (auxiliaryWorkingHoursDay.getState().equals("宸插鏍�")) {
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ auxiliaryWorkingHoursDay.setReviewer(userMapper.selectById(userId).getName());
+ }
+ if (auxiliaryWorkingHoursDay.getReviewerNumber() == null) {
+ auxiliaryWorkingHoursDay.setReviewerNumber(auxiliaryWorkingHoursDay.getAmount());//澶嶆牳鏁伴噺
+ auxiliaryWorkingHoursDay.setReviewerNonproductiveTime(auxiliaryWorkingHoursDay.getNonproductiveTime());//澶嶆牳宸ユ椂
+ }
+
}
- return auxiliaryWorkingHoursDayMapper.updateById(auxiliaryWorkingHoursDay);
+ return updateBatchById(auxiliaryWorkingHoursDays);
}
//缂栬緫
--
Gitblit v1.9.3