From 390574e0d9d01618c867c5db6a9ab21a43057eda Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 08 八月 2025 15:40:11 +0800
Subject: [PATCH] 部分新功能
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualMaintenanceServiceServiceImpl.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualMaintenanceServiceServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualMaintenanceServiceServiceImpl.java
index a4348c7..88b9bda 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualMaintenanceServiceServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualMaintenanceServiceServiceImpl.java
@@ -54,6 +54,7 @@
}
@Override
+ @Transactional
public CommonResult saveAnnualMaintenanceService(AnnualMaintenanceService annualMaintenanceService) {
List<AnnualMaintenanceServiceContent> annualMaintenanceServiceContentList = annualMaintenanceService.getAnnualMaintenanceServiceContentList();
List<AnnualMaintenanceServiceUser> annualMaintenanceServiceUserList = annualMaintenanceService.getAnnualMaintenanceServiceUserList();
@@ -118,27 +119,33 @@
List<AnnualMaintenanceServiceUser> addUser = annualMaintenanceServiceUserList.stream()
.filter(user -> null == user.getId())
.collect(Collectors.toList());
- addUser.forEach(user -> {
- user.setCreateBy(SecurityUtils.getUsername());
- user.setCreateTime(LocalDateTime.now());
- user.setAnnualMaintenanceServiceId(serviceId);
- });
- int i = annualMaintenanceServiceUserMapper.batchInsert(addUser);
- if (i <= 0) {
- throw new RuntimeException("保存失败");
+ if (ObjectUtil.isNotEmpty(addUser)){
+ addUser.forEach(user -> {
+ user.setCreateBy(SecurityUtils.getUsername());
+ user.setCreateTime(LocalDateTime.now());
+ user.setAnnualMaintenanceServiceId(serviceId);
+ });
+ int i = annualMaintenanceServiceUserMapper.batchInsert(addUser);
+ if (i <= 0) {
+ throw new RuntimeException("保存失败");
+ }
}
+
List<AnnualMaintenanceServiceUser> updateUser = annualMaintenanceServiceUserList.stream()
.filter(user -> null != user.getId())
.collect(Collectors.toList());
- updateUser.forEach(user -> {
- user.setUpdateBy(SecurityUtils.getUsername());
- user.setUpdateTime(LocalDateTime.now());
- });
- int update = annualMaintenanceServiceUserMapper.batchUpdate(updateUser);
- if (update <= 0) {
- throw new RuntimeException("保存失败");
+ if (ObjectUtil.isNotEmpty(updateUser)){
+ updateUser.forEach(user -> {
+ user.setUpdateBy(SecurityUtils.getUsername());
+ user.setUpdateTime(LocalDateTime.now());
+ });
+ int update = annualMaintenanceServiceUserMapper.batchUpdate(updateUser);
+ if (update <= 0) {
+ throw new RuntimeException("保存失败");
+ }
}
+
}
private void checkUser(List<AnnualMaintenanceServiceUser> annualMaintenanceServiceUserList) {
@@ -175,7 +182,7 @@
if (ObjectUtil.isEmpty(filteredUsers3)) {
throw new RuntimeException("请填写二级保养操作人员");
}
- Set<Long> userIdSet3 = filteredUsers.stream()
+ Set<Long> userIdSet3 = filteredUsers3.stream()
.map(AnnualMaintenanceServiceUser::getUserId)
.collect(Collectors.toSet());
if (userIdSet3.size() != filteredUsers3.size()) {
@@ -188,7 +195,7 @@
if (ObjectUtil.isEmpty(filteredUsers4)) {
throw new RuntimeException("请填写二级保养检查人员");
}
- Set<Long> userIdSet4 = filteredUsers2.stream()
+ Set<Long> userIdSet4 = filteredUsers4.stream()
.map(AnnualMaintenanceServiceUser::getUserId)
.collect(Collectors.toSet());
if (userIdSet4.size() != filteredUsers4.size()) {
--
Gitblit v1.9.2