From ba2482dddc5df9f31fe9aef8543bef8453a22f88 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 24 二月 2025 22:05:40 +0800
Subject: [PATCH] 项目编辑bug
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 49 ++++++++++++++++++-------------------------------
1 files changed, 18 insertions(+), 31 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 ac53878..b8c5db5 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -817,7 +817,7 @@
entity.setCreateBy(userId);
entity.setUpdateBy(userId);
//濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
- if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
+ if ("0".equals(entity.getProjectPhase())) {
entity.setUsedStatus(ProjectConstant.PASS);
}
// 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃
@@ -828,6 +828,7 @@
throw new RuntimeException("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
}
baseMapper.insert(entity);
+ projectId = entity.getId();
addPlan(entity.getId()); //娣诲姞璁″垝琛�
//娣诲姞椤圭洰涓爣鍗曚綅
List<ProjectInfoWinUnit> projectInfoWinUnits = new ArrayList<>();
@@ -850,26 +851,6 @@
}
if (!CollectionUtils.isEmpty(projectInfoYearPlans)) {
projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
- }
- // 鏂板
- if (Objects.nonNull(form.getProjectInvestmentInfoForm())) {
- form.getProjectInvestmentInfoForm().setProjectId(projectId);
- projectInvestmentInfoServiceImpl.add(form.getProjectInvestmentInfoForm());
- }
-
- if (Objects.nonNull(form.getProjectInvestmentFundingForm())) {
- form.getProjectInvestmentFundingForm().setProjectId(projectId);
- projectInvestmentFundingServiceImpl.add(form.getProjectInvestmentFundingForm());
- }
-
- if (Objects.nonNull(form.getProjectInvestmentPolicyComplianceForm())) {
- form.getProjectInvestmentPolicyComplianceForm().setProjectId(projectId);
- projectInvestmentPolicyComplianceServiceImpl.add(form.getProjectInvestmentPolicyComplianceForm());
- }
-
- if (Objects.nonNull(form.getProjectUnitRegistrationInfoForm())) {
- form.getProjectUnitRegistrationInfoForm().setProjectId(projectId);
- projectUnitRegistrationInfoServiceImpl.add(form.getProjectUnitRegistrationInfoForm());
}
} else {
//鏇存柊
@@ -926,19 +907,25 @@
if (!CollectionUtils.isEmpty(projectInfoYearPlans)) {
projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
}
- // 鏇存柊
- if (Objects.nonNull(form.getProjectInvestmentInfoForm())) {
- projectInvestmentInfoServiceImpl.update(form.getProjectInvestmentInfoForm());
+ }
+
+ // 鏇存柊鍏跺畠椤圭洰淇℃伅琛�
+ if (Objects.nonNull(form.getProjectInvestmentFundingForm())) {
+ if (Objects.nonNull(form.getProjectInvestmentFundingForm().getId())) {
+ projectInvestmentFundingServiceImpl.update(form.getProjectInvestmentFundingForm());
+ } else {
+ form.getProjectInvestmentFundingForm().setProjectId(projectId);
+ projectInvestmentFundingServiceImpl.add(form.getProjectInvestmentFundingForm());
}
- if (Objects.nonNull(form.getProjectInvestmentFundingForm())) {
- projectInvestmentFundingServiceImpl.update();
- }
- if (Objects.nonNull(form.getProjectInvestmentPolicyComplianceForm())) {
- projectInvestmentPolicyComplianceServiceImpl.update(form.getProjectInvestmentPolicyComplianceForm());
- }
- if (Objects.nonNull(form.getProjectUnitRegistrationInfoForm())) {
+ }
+ if (Objects.nonNull(form.getProjectUnitRegistrationInfoForm())) {
+ if (Objects.nonNull(form.getProjectUnitRegistrationInfoForm().getId())) {
projectUnitRegistrationInfoServiceImpl.update(form.getProjectUnitRegistrationInfoForm());
+ } else {
+ form.getProjectUnitRegistrationInfoForm().setProjectId(projectId);
+ projectUnitRegistrationInfoServiceImpl.add(form.getProjectUnitRegistrationInfoForm());
}
+
}
}
return Result.ok("淇濆瓨鎴愬姛");
--
Gitblit v1.8.0