From f9feae49eee21286708bcef1cea91be34d9e9241 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 25 十一月 2025 09:04:59 +0800
Subject: [PATCH] 修改新增
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualVerificationPlanServiceImpl.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualVerificationPlanServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualVerificationPlanServiceImpl.java
index 748a0a8..2233340 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualVerificationPlanServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualVerificationPlanServiceImpl.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.AnnualVerificationDevice;
@@ -55,12 +56,27 @@
if (ObjectUtils.isEmpty(annualVerificationDevices)){
return CommonResult.failed("保存参数不能为空");
}
+
+ LambdaQueryWrapper<AnnualVerificationPlan> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(AnnualVerificationPlan::getDelFlag, UserConstant.ENABLE);
+ queryWrapper.eq(AnnualVerificationPlan::getCompanyId, annualVerificationPlan.getCompanyId());
int i = 0;
if (annualVerificationPlan.getId() == null){
+ queryWrapper.eq(AnnualVerificationPlan::getYear, annualVerificationPlan.getYear());
+ Long l = annualVerificationPlanMapper.selectCount(queryWrapper);
+ if (l > 0){
+ return CommonResult.failed("该年度计划已存在");
+ }
annualVerificationPlan.setCreateBy(SecurityUtils.getUsername());
annualVerificationPlan.setCreateTime(LocalDateTime.now());
i = annualVerificationPlanMapper.insert(annualVerificationPlan);
}else {
+ queryWrapper.eq(AnnualVerificationPlan::getYear, annualVerificationPlan.getYear());
+ queryWrapper.ne(AnnualVerificationPlan::getId, annualVerificationPlan.getId());
+ Long l = annualVerificationPlanMapper.selectCount(queryWrapper);
+ if (l > 0){
+ return CommonResult.failed("该年度计划已存在");
+ }
annualVerificationPlan.setUpdateTime(LocalDateTime.now());
annualVerificationPlan.setUpdateBy(SecurityUtils.getUsername());
i = annualVerificationPlanMapper.updateById(annualVerificationPlan);
@@ -74,12 +90,12 @@
private void batchSave(Long id, List<AnnualVerificationDevice> annualVerificationDevices, List<Long> delData) {
if (ObjectUtils.isNotEmpty(delData)){
int update = annualVerificationDeviceMapper.update(new AnnualVerificationDevice(),
- new LambdaUpdateWrapper<AnnualVerificationDevice>().set(AnnualVerificationDevice::getDelFlag, UserConstant.DEPT_DISABLE)
+ new LambdaUpdateWrapper<AnnualVerificationDevice>().set(AnnualVerificationDevice::getDelFlag, UserConstant.DISENABLE)
.set(AnnualVerificationDevice::getUpdateTime, LocalDateTime.now()).set(AnnualVerificationDevice::getUpdateBy, SecurityUtils.getUsername())
.in(AnnualVerificationDevice::getId, delData)
);
- if (update >= 0){
- throw new RuntimeException("操作失败");
+ if (update <= 0){
+ throw new ApiException("操作失败");
}
}
annualVerificationDevices.forEach(annualVerificationDevice -> {
@@ -115,13 +131,13 @@
public CommonResult deletedAnnualVerificationPlan(Long id) {
int i = annualVerificationPlanMapper.update(new AnnualVerificationPlan(),
- new LambdaUpdateWrapper<AnnualVerificationPlan>().eq(AnnualVerificationPlan::getId, id).set(AnnualVerificationPlan::getDelFlag, UserConstant.DEPT_DISABLE)
+ new LambdaUpdateWrapper<AnnualVerificationPlan>().eq(AnnualVerificationPlan::getId, id).set(AnnualVerificationPlan::getDelFlag, UserConstant.DISENABLE)
.set(AnnualVerificationPlan::getUpdateTime, LocalDateTime.now()).set(AnnualVerificationPlan::getUpdateBy, SecurityUtils.getUsername())
);
if (i > 0) {
annualVerificationDeviceMapper.update(new AnnualVerificationDevice(),
new LambdaUpdateWrapper<AnnualVerificationDevice>().eq(AnnualVerificationDevice::getAnnualVerificationId, id)
- .set(AnnualVerificationDevice::getDelFlag, UserConstant.DEPT_DISABLE)
+ .set(AnnualVerificationDevice::getDelFlag, UserConstant.DISENABLE)
.set(AnnualVerificationDevice::getUpdateTime, LocalDateTime.now())
.set(AnnualVerificationDevice::getUpdateBy, SecurityUtils.getUsername()));
}
--
Gitblit v1.9.2