From 8160808e6b69f2d1a0e0ea1a249582f563a2c3e6 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 24 二月 2025 12:01:30 +0800
Subject: [PATCH] sql p.deleted = 0
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
index 7f9ff2e..fe7b15f 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -117,7 +117,7 @@
entity.setUsedStatus(ProjectConstant.PASS);
}
if(!checkProjectNameAndIdIsUnique(entity,null)){
- return Result.error("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
+ throw new RuntimeException("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
}
baseMapper.insert(entity);
addPlan(entity.getId()); //娣诲姞璁″垝琛�
@@ -146,7 +146,7 @@
if (updateId == null) {
queryWrapper.eq("project_name", entity.getProjectName());
-
+ queryWrapper.eq("deleted",0);
if (StringUtils.isNotEmpty(entity.getProjectCode())) {
queryWrapper.eq("project_code", entity.getProjectCode());
}
@@ -194,7 +194,7 @@
entity.setUsedStatus(ProjectConstant.PASS);
}
if(!checkProjectNameAndIdIsUnique(entity,form.getId())){
- return Result.error("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
+ throw new RuntimeException("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
}
//鏇存柊椤圭洰淇℃伅
baseMapper.updateById(entity);
@@ -807,19 +807,19 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Result editProject(ProjectForm form) {
+ Long projectId = null;
if (ObjectUtil.isNotNull(form.getProjectInfoForm())) {
-
if (ObjectUtil.isNull(form.getProjectInfoForm().getId())) {
//鏂板
- return ((ProjectInfoServiceImpl) AopContext.currentProxy()).add(form.getProjectInfoForm());
-
+ projectId = (Long) ((ProjectInfoServiceImpl) AopContext.currentProxy()).add(form.getProjectInfoForm()).get("data");
} else {
//鏇存柊
- return ((ProjectInfoServiceImpl) AopContext.currentProxy()).update(form.getProjectInfoForm());
+ ((ProjectInfoServiceImpl) AopContext.currentProxy()).update(form.getProjectInfoForm());
}
}
if (ObjectUtil.isNotNull(form.getProjectInvestmentInfoForm())) {
if (ObjectUtil.isNull(form.getProjectInvestmentInfoForm().getId())) {
+ form.getProjectInvestmentInfoForm().setProjectId(projectId);
projectInvestmentInfoServiceImpl.add(form.getProjectInvestmentInfoForm());
} else {
projectInvestmentInfoServiceImpl.update(form.getProjectInvestmentInfoForm());
@@ -827,6 +827,7 @@
}
if (ObjectUtil.isNotNull(form.getProjectInvestmentFundingForm())) {
if (ObjectUtil.isNull(form.getProjectInvestmentFundingForm().getId())) {
+ form.getProjectInvestmentFundingForm().setProjectId(projectId);
projectInvestmentFundingServiceImpl.add(form.getProjectInvestmentFundingForm());
} else {
projectInvestmentFundingServiceImpl.update(form.getProjectInvestmentFundingForm());
@@ -834,6 +835,7 @@
}
if (ObjectUtil.isNotNull(form.getProjectInvestmentPolicyComplianceForm())) {
if (ObjectUtil.isNull(form.getProjectInvestmentPolicyComplianceForm().getId())) {
+ form.getProjectInvestmentPolicyComplianceForm().setProjectId(projectId);
projectInvestmentPolicyComplianceServiceImpl.add(form.getProjectInvestmentPolicyComplianceForm());
} else {
projectInvestmentPolicyComplianceServiceImpl.update(form.getProjectInvestmentPolicyComplianceForm());
@@ -841,6 +843,7 @@
}
if (ObjectUtil.isNotNull(form.getProjectUnitRegistrationInfoForm())) {
if (ObjectUtil.isNull(form.getProjectUnitRegistrationInfoForm().getId())) {
+ form.getProjectUnitRegistrationInfoForm().setProjectId(projectId);
projectUnitRegistrationInfoServiceImpl.add(form.getProjectUnitRegistrationInfoForm());
} else {
projectUnitRegistrationInfoServiceImpl.update(form.getProjectUnitRegistrationInfoForm());
--
Gitblit v1.8.0