From a10a94b62cc029c0ccaa47b61c6f23e2bfe26a23 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 23 二月 2025 11:30:11 +0800
Subject: [PATCH] 项目编辑bug

---
 business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java |   40 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 39 insertions(+), 1 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 4bdbcd7..611867a 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -116,6 +116,9 @@
         if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
             entity.setUsedStatus(ProjectConstant.PASS);
         }
+        if(!checkProjectNameAndIdIsUnique(entity,null)){
+            throw new RuntimeException("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
+        }
         baseMapper.insert(entity);
         addPlan(entity.getId()); //娣诲姞璁″垝琛�
         //娣诲姞鏂囦欢
@@ -133,6 +136,32 @@
         return Result.ok("娣诲姞鎴愬姛").data(entity.getId());
     }
 
+    /**
+     * 鍒ゆ柇椤圭洰鍚嶅拰椤圭洰鐮佹槸鍚﹀敮涓�
+     * @param entity from true 鏉ヨ嚜add() false 鏉ヨ嚜edit()
+     * @return
+     */
+    public boolean  checkProjectNameAndIdIsUnique(ProjectInfo entity,Long updateId){
+        QueryWrapper<ProjectInfo> queryWrapper = new QueryWrapper<ProjectInfo>();
+        if (updateId == null) {
+
+            queryWrapper.eq("project_name", entity.getProjectName());
+
+            if (StringUtils.isNotEmpty(entity.getProjectCode())) {
+                queryWrapper.eq("project_code", entity.getProjectCode());
+            }
+
+            List<ProjectInfo> project = projectInfoMapper.selectList(queryWrapper);
+
+            return project == null || project.isEmpty();
+        }else {
+
+            List<ProjectInfo> project = projectInfoMapper.checkProjectNameAndIdIsUnique(updateId,entity.getProjectName(),entity.getProjectCode());
+
+            return project == null || project.isEmpty();
+        }
+
+    }
 
     public void addPlan(Long projectInfoId) {
         Plan plan = new Plan();
@@ -154,6 +183,7 @@
     @Override
     public Result update(ProjectInfoForm form) {
         ProjectInfo entity = baseMapper.selectById(form.getId());
+
         // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
         Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
         ProjectInfoForm.getEntityByForm(form, entity);
@@ -162,6 +192,9 @@
         //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
         if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
             entity.setUsedStatus(ProjectConstant.PASS);
+        }
+        if(!checkProjectNameAndIdIsUnique(entity,form.getId())){
+            throw new RuntimeException("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
         }
         //鏇存柊椤圭洰淇℃伅
         baseMapper.updateById(entity);
@@ -774,10 +807,11 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result editProject(ProjectForm form) {
+        Long projectId = null;
         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());
@@ -785,6 +819,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());
@@ -792,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());
@@ -799,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());
@@ -806,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