【优化】项目编码关联项目名称相关修改

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

@@ -75,7 +75,6 @@ public class CbProjectRecordController extends BaseController {
      * 新增项目
      */
     @PostMapping("/addProject")
-    //@SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY, TenantConstants.TENANT_SUPER_ADMIN_ROLE_KEY}, mode = SaMode.OR)
     public R<CbProjectRecord> addProject(@Validated @RequestBody AddCbProjectBo addCbProjectBo) {
         CbProjectRecord projectRecord = baseService.addProject(addCbProjectBo);
         Assert.notNull(projectRecord, "新增项目失败,请联系管理员");

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.common.constant.TenantConstants;
 import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.helper.LoginHelper;
@@ -24,6 +25,7 @@ import com.dsk.cscec.domain.vo.CbProjectHeadInfoVo;
 import com.dsk.cscec.domain.vo.CbProjectRecordSearchVo;
 import com.dsk.cscec.mapper.CbProjectFileMapper;
 import com.dsk.cscec.mapper.CbProjectRecordMapper;
+import com.dsk.cscec.mapper.DProjectMapper;
 import com.dsk.cscec.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.aop.framework.AopContext;
@@ -64,6 +66,8 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
     private ICbCostMeasureService costMeasureService;
     @Resource
     private CbDirectExpenseService directExpenseService;
+    @Resource
+    private DProjectMapper dProjectMapper;
 
     /**
      * 校验项目名称是否存在
@@ -92,6 +96,16 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public CbProjectRecord addProject(AddCbProjectBo addCbProjectBo) {
+        //仅管理员可创建IPM系统中不存在的项目
+        Objects.requireNonNull(LoginHelper.getLoginUser()).getRolePermission().forEach(permission -> {
+            if (!TenantConstants.SUPER_ADMIN_ROLE_KEY.equals(permission) &&
+                    !TenantConstants.TENANT_SUPER_ADMIN_ROLE_KEY.equals(permission) &&
+                    !TenantConstants.TENANT_ADMIN_ROLE_KEY.equals(permission)) {
+                Assert.isFalse(dProjectMapper.exists(new LambdaQueryWrapper<DProject>()
+                        .eq(DProject::getProjectName, addCbProjectBo.getProjectName())), "IPM系统中不存在该项目,请重新选择");
+            }
+        });
+
         CbProjectRecord projectRecord = BeanUtil.toBean(addCbProjectBo, CbProjectRecord.class);
 
         //生成唯一关联ID

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

@@ -41,6 +41,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 咨询机构管理
@@ -321,7 +322,9 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
     public List<DProject> queryProjectNameList(String projectName) {
         return baseMapper.selectList(new LambdaQueryWrapper<DProject>()
                 .select(DProject::getProjectName, DProject::getProjectCode)
-                .like(StringUtils.isNotBlank(projectName), DProject::getProjectName, projectName));
+                .like(StringUtils.isNotBlank(projectName), DProject::getProjectName, projectName)).stream().peek(item -> {
+            item.setProjectName(StringUtils.markInRed(item.getProjectName(), projectName));
+        }).collect(Collectors.toList());
     }
 }