From ed78556dcef1e935d7128474078b680f7aac5830 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 25 二月 2025 01:03:55 +0800
Subject: [PATCH] 项目去重校验完善

---
 business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java |   32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 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 677b8b7..a7fb97f 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -10,6 +10,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ycl.common.base.Result;
@@ -154,21 +155,18 @@
     public boolean  checkProjectNameAndIdIsUnique(ProjectInfo entity,Long updateId){
         QueryWrapper<ProjectInfo> queryWrapper = new QueryWrapper<ProjectInfo>();
         if (updateId == null) {
-
-            queryWrapper.eq("project_name", entity.getProjectName());
-            queryWrapper.eq("deleted",0);
-            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();
+            List<ProjectInfo> list = new LambdaQueryChainWrapper<>(baseMapper)
+                    .eq(ProjectInfo::getProjectName, entity.getProjectName())
+                    .eq(ProjectInfo::getProjectCode, entity.getProjectCode())
+                    .list();
+            return list == null || list.isEmpty();
+        } else {
+            List<ProjectInfo> list = new LambdaQueryChainWrapper<>(baseMapper)
+                    .eq(ProjectInfo::getProjectName, entity.getProjectName())
+                    .eq(ProjectInfo::getProjectCode, entity.getProjectCode())
+                    .ne(ProjectInfo::getId, updateId)
+                    .list();
+            return list == null || list.isEmpty();
         }
 
     }
@@ -818,7 +816,7 @@
                 entity.setCreateBy(userId);
                 entity.setUpdateBy(userId);
                 //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
-                if ("0".equals(entity.getProjectPhase())) {
+                if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase())) {
                     entity.setUsedStatus(ProjectConstant.PASS);
                 }
                 // 绠$悊鍛樹慨鏀圭殑鐩存帴閫氳繃
@@ -863,7 +861,7 @@
                 Long userId = SecurityUtils.getUserId();
                 entity.setUpdateBy(userId);
                 //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
-                if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
+                if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase())) {
                     entity.setUsedStatus(ProjectConstant.PASS);
                 }
                 // 绠$悊鍛樹慨鏀圭殑鐩存帴閫氳繃

--
Gitblit v1.8.0