From 1fb4b09dcc8679beb8a3389197670c165ff9056b Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 27 二月 2025 17:56:12 +0800
Subject: [PATCH] 在库项目,隐藏列可操作保存

---
 business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 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 47ece3d..62ae364 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -7,6 +7,7 @@
 import cn.hutool.core.util.ZipUtil;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -117,7 +118,7 @@
             entity.setUsedStatus(ProjectConstant.PASS);
         }
         if(!checkProjectNameAndIdIsUnique(entity,null)){
-            return Result.error("椤圭洰鍚嶆垨椤圭洰鐮佸凡瀛樺湪");
+            throw new RuntimeException("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
         }
         baseMapper.insert(entity);
         addPlan(entity.getId()); //娣诲姞璁″垝琛�
@@ -142,14 +143,12 @@
      * @return
      */
     public boolean  checkProjectNameAndIdIsUnique(ProjectInfo entity,Long updateId){
-        QueryWrapper<ProjectInfo> queryWrapper = new QueryWrapper<ProjectInfo>();
+        LambdaQueryWrapper<ProjectInfo> queryWrapper = new LambdaQueryWrapper<>();
         if (updateId == null) {
-
-            queryWrapper.eq("project_name", entity.getProjectName());
-
+            queryWrapper.eq(ProjectInfo::getProjectName, entity.getProjectName());
+            queryWrapper.eq(ProjectInfo::getDeleted,0);
             if (StringUtils.isNotEmpty(entity.getProjectCode())) {
-                queryWrapper.or();
-                queryWrapper.eq("project_code", entity.getProjectCode());
+                queryWrapper.eq(ProjectInfo::getProjectCode, entity.getProjectCode());
             }
 
             List<ProjectInfo> project = projectInfoMapper.selectList(queryWrapper);
@@ -194,8 +193,12 @@
         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())){
-            return Result.error("椤圭洰鍚嶆垨椤圭洰鐮佸凡瀛樺湪");
+            throw new RuntimeException("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
         }
         //鏇存柊椤圭洰淇℃伅
         baseMapper.updateById(entity);
@@ -808,19 +811,19 @@
     @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())) {
                 //鏂板
-                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());
@@ -828,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());
@@ -835,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());
@@ -842,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