From 17e9ad4bbbbd0129e8da4dc0cfeee0028d7121e0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 24 二月 2025 17:40:23 +0800
Subject: [PATCH] 资金类型和重点分类多选
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 9e6ed0b..aa3c90f 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -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());
}
@@ -191,6 +191,10 @@
entity.setUpdateBy(userId);
//濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
+ entity.setUsedStatus(ProjectConstant.PASS);
+ }
+ // 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃
+ if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
entity.setUsedStatus(ProjectConstant.PASS);
}
if(!checkProjectNameAndIdIsUnique(entity,form.getId())){
@@ -807,11 +811,11 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Result editProject(ProjectForm form) {
+ Long projectId = form.getProjectInfoForm().getId();
if (ObjectUtil.isNotNull(form.getProjectInfoForm())) {
-
if (ObjectUtil.isNull(form.getProjectInfoForm().getId())) {
//鏂板
- ((ProjectInfoServiceImpl) AopContext.currentProxy()).add(form.getProjectInfoForm());
+ projectId = (Long) ((ProjectInfoServiceImpl) AopContext.currentProxy()).add(form.getProjectInfoForm()).get("data");
} else {
//鏇存柊
((ProjectInfoServiceImpl) AopContext.currentProxy()).update(form.getProjectInfoForm());
@@ -819,6 +823,7 @@
}
if (ObjectUtil.isNotNull(form.getProjectInvestmentInfoForm())) {
if (ObjectUtil.isNull(form.getProjectInvestmentInfoForm().getId())) {
+ form.getProjectInvestmentInfoForm().setProjectId(projectId);
projectInvestmentInfoServiceImpl.add(form.getProjectInvestmentInfoForm());
} else {
projectInvestmentInfoServiceImpl.update(form.getProjectInvestmentInfoForm());
@@ -826,6 +831,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());
@@ -833,6 +839,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());
@@ -840,6 +847,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