项目台账列表项目bug修复

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbProjectRecordController.java

 package com.dsk.cscec.controller;
 
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.domain.R;
@@ -13,10 +14,12 @@ import com.dsk.cscec.domain.vo.CbProjectInfoVo;
 import com.dsk.cscec.domain.vo.CbProjectRecordSearchVo;
 import com.dsk.cscec.service.CbProjectRecordService;
 import com.dsk.cscec.service.IDProjectService;
+import com.dsk.search.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Arrays;
 import java.util.List;
@@ -50,6 +53,15 @@ public class CbProjectRecordController extends BaseController {
         }
     }
 
+    /**
+     * 校验项目名称是否存在
+     */
+    @GetMapping("/checkProjectNameExist/projectName")
+    public R<CbProjectRecord> checkProjectNameExist(@RequestParam @NotBlank(message = "项目名称不能为空") String projectName) {
+        CbProjectRecord projectRecord = baseService.checkProjectNameExist(projectName);
+        return R.ok(ObjectUtil.isNotNull(projectRecord) ? "已存在相同名称项目,是否继续创建该项目的新阶段?" : "操作成功", projectRecord);
+    }
+
     /**
      * 新增项目
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/CbProjectRecordService.java

@@ -18,6 +18,14 @@ import java.util.List;
  * @since 2024-02-05 11:37:53
  */
 public interface CbProjectRecordService extends IService<CbProjectRecord> {
+    /**
+     * 校验项目名称是否存在
+     *
+     * @param projectName 项目名称
+     * @return 项目实体
+     */
+    CbProjectRecord checkProjectNameExist(String projectName);
+
     /**
      * 新增项目
      *

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectRecordServiceImpl.java

@@ -63,6 +63,24 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
     @Resource
     private CbDirectExpenseService directExpenseService;
 
+    /**
+     * 校验项目名称是否存在
+     *
+     * @param projectName 项目名称
+     * @return 项目实体
+     */
+    @Override
+    public CbProjectRecord checkProjectNameExist(String projectName) {
+        if (StringUtils.isNotBlank(projectName)) {
+            return baseMapper.selectOne(new LambdaQueryWrapper<CbProjectRecord>()
+                    .eq(CbProjectRecord::getProjectName, projectName)
+                    .eq(CbProjectRecord::getDelFlag, CbProjectConstants.DELETE_FLAG_EXIST)
+                    .orderByDesc(CbProjectRecord::getCbStage)
+                    .last("LIMIT 1"));
+        }
+        return null;
+    }
+
     /**
      * 新增项目
      *
@@ -198,8 +216,8 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
         for (CbProjectRecordSearchVo searchVo : page.getRecords()) {
             //判断是否有历史阶段
             searchVo.setHasChildren(baseMapper.selectCount(new LambdaQueryWrapper<CbProjectRecord>()
-                    .eq(CbProjectRecord::getRelatedId, searchVo.getRelatedId())
-                    //.ne(CbProjectRecord::getProjectFileStatus, CbProjectConstants.PROJECT_FILE_STATUS_PREPARING)
+                                    .eq(CbProjectRecord::getRelatedId, searchVo.getRelatedId())
+                            //.ne(CbProjectRecord::getProjectFileStatus, CbProjectConstants.PROJECT_FILE_STATUS_PREPARING)
                     ) > 1
             );
 
@@ -245,7 +263,7 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
         projectRecordList.forEach(record -> {
             //关键字标红
             if (StringUtils.isNotBlank(searchBo.getProjectName())) {
-                record.setProjectName(StringUtils.markInRed(record.getProjectFileName(), searchBo.getProjectName()));
+                record.setProjectName(StringUtils.markInRed(record.getProjectName(), searchBo.getProjectName()));
             }
             //补充更新时间、更新人
             CbProjectFile projectFile = projectFileMapper.selectOne(new LambdaQueryWrapper<CbProjectFile>()