From 7f89db04cc75a842352087099ee6a7431b7357e0 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 09 十二月 2025 15:12:24 +0800
Subject: [PATCH] 修改返回所有数据
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualMaintenanceRecordServiceImpl.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualMaintenanceRecordServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualMaintenanceRecordServiceImpl.java
index 4e5f56a..a711980 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualMaintenanceRecordServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualMaintenanceRecordServiceImpl.java
@@ -6,6 +6,7 @@
import com.gkhy.exam.common.api.CommonPage;
import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.common.constant.UserConstant;
+import com.gkhy.exam.common.exception.ApiException;
import com.gkhy.exam.common.utils.PageUtils;
import com.gkhy.exam.common.utils.SecurityUtils;
import com.gkhy.exam.system.domain.AnnualMaintenanceRecord;
@@ -65,7 +66,7 @@
i = annualMaintenanceRecordMapper.updateById(annualMaintenanceRecord);
}
if (i > 0){
-
+ batchSaveRecordUser(isAdd, annualMaintenanceRecord.getId(), annualMaintenanceRecordUsers, annualMaintenanceRecord.getDelRecordUserIds());
return CommonResult.success();
}
return CommonResult.failed();
@@ -78,19 +79,23 @@
.map(AnnualMaintenanceRecordUser::getUserId)
.collect(Collectors.toSet());
if (userIdSet.size() != filteredUsers.size()){
- throw new RuntimeException("年度基础设施维护记录操作管理人员重复");
+ throw new ApiException("年度基础设施维护记录操作管理人员重复");
}
+ //维修员
List<AnnualMaintenanceRecordUser> fixUsers = annualMaintenanceRecordUsers.stream()
.filter(user -> 2 == user.getUserType())
.collect(Collectors.toList());
- Set<Long> fixUserIdSet = fixUsers.stream()
- .map(AnnualMaintenanceRecordUser::getUserId)
- .collect(Collectors.toSet());
- if (fixUserIdSet.size() != fixUsers.size()){
- throw new RuntimeException("年度基础设施维护记录人员重复");
+ if (!ObjectUtils.isEmpty(fixUsers)){
+ Set<Long> fixUserIdSet = fixUsers.stream()
+ .map(AnnualMaintenanceRecordUser::getUserId)
+ .collect(Collectors.toSet());
+ if (fixUserIdSet.size() != fixUsers.size()){
+ throw new ApiException("年度基础设施维护记录人员重复");
+ }
}
- if (ObjectUtils.isEmpty(filteredUsers) || ObjectUtils.isEmpty(fixUsers)){
- throw new RuntimeException("年度基础设施维护记录人员或操作管理人员不能为空");
+
+ if (ObjectUtils.isEmpty(filteredUsers) ){
+ throw new ApiException("年度基础设施维护记录操作管理人员不能为空");
}
if (ObjectUtils.isNotEmpty(delRecordUserIds)){
@@ -101,7 +106,7 @@
.in(AnnualMaintenanceRecordUser::getId, delRecordUserIds)
);
if (update <= 0){
- throw new RuntimeException("删除年度基础设施维护记录人员失败");
+ throw new ApiException("删除年度基础设施维护记录人员失败");
}
}
@@ -114,7 +119,7 @@
});
int insert = annualMaintenanceRecordUserMapper.batchInsert(annualMaintenanceRecordUsers);
if (insert <= 0){
- throw new RuntimeException("保存年度基础设施维护记录人员失败");
+ throw new ApiException("保存年度基础设施维护记录人员失败");
}
}else {
List<AnnualMaintenanceRecordUser> addUser = annualMaintenanceRecordUsers.stream()
@@ -126,14 +131,14 @@
user.setCreateTime(LocalDateTime.now());
user.setCreateBy(SecurityUtils.getUsername());
});
- int insert = annualMaintenanceRecordUserMapper.batchInsert(annualMaintenanceRecordUsers);
+ int insert = annualMaintenanceRecordUserMapper.batchInsert(addUser);
if (insert <= 0){
- throw new RuntimeException("保存年度基础设施维护记录人员失败");
+ throw new ApiException("保存年度基础设施维护记录人员失败");
}
}
List<AnnualMaintenanceRecordUser> updateUser = annualMaintenanceRecordUsers.stream()
- .filter(user -> null == user.getId())
+ .filter(user -> null != user.getId())
.collect(Collectors.toList());
if (ObjectUtils.isNotEmpty(updateUser)){
updateUser.forEach(user -> {
@@ -142,7 +147,7 @@
});
int update = annualMaintenanceRecordUserMapper.batchUpdate(updateUser);
if (update <= 0){
- throw new RuntimeException("保存年度基础设施维护记录人员失败");
+ throw new ApiException("保存年度基础设施维护记录人员失败");
}
}
@@ -183,9 +188,9 @@
LambdaQueryWrapper<AnnualMaintenanceRecordUser> eq = new LambdaQueryWrapper<AnnualMaintenanceRecordUser>().eq(AnnualMaintenanceRecordUser::getAnnualMaintenanceRecordId, id);
int update1 = annualMaintenanceRecordUserMapper.update(annualMaintenanceRecordUser, eq);
- if (update1 <= 0){
- throw new RuntimeException("删除年度基础设施维护计划人员失败");
- }
+// if (update1 <= 0){
+// throw new RuntimeException("删除年度基础设施维护计划人员失败");
+// }
return CommonResult.success();
}
return CommonResult.failed();
--
Gitblit v1.9.2