Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/constant/CbProjectConstants.java

@@ -20,6 +20,10 @@ public interface CbProjectConstants {
      * 成本阶段:转固
      */
     Integer CB_STAGE_TO_SOLID = 2;
+    /**
+     * 成本阶段:暂无成本计划
+     */
+    Integer CB_STAGE_NO_COST_PLAN = 3;
     /**
      * 项目文件状态:准备中
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/AddCbProjectBo.java

@@ -2,6 +2,7 @@ package com.dsk.cscec.domain.bo;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -14,6 +15,7 @@ public class AddCbProjectBo {
     /**
      * 项目名称
      */
+    @NotBlank(message = "项目名称不能为空")
     private String projectName;
     /**
      * IPM项目编码
@@ -29,7 +31,7 @@ public class AddCbProjectBo {
      */
     private String projectFileName;
     /**
-     * 成本阶段(0:标前成本、1:标后成本、2:转固成本)
+     * 成本阶段(0:标前成本、1:标后成本、2:转固成本、3:暂无成本计划)
      */
     @NotNull(message = "未选择成本阶段")
     private Integer cbStage;

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/CbProjectRecordMapper.java

@@ -23,12 +23,12 @@ public interface CbProjectRecordMapper extends BaseMapper<CbProjectRecord> {
     Page<CbProjectRecordSearchVo> selectPageProjectRecordList(IPage<CbProjectSearchBo> build,
                                                               @Param("searchBo") CbProjectSearchBo searchBo,
                                                               @Param("deleteFlagExist") Integer deleteFlagExist,
-                                                              @Param("projectFileStatusPreparing") Integer projectFileStatusPreparing);
+                                                              @Param("projectFileStatusPreparing") Integer projectFileStatusPreparing,
+                                                              @Param("cbStageNoCostPlan") Integer cbStageNoCostPlan);
 
     /**
      * 获取草稿弹窗列表
      */
     Page<CbProjectRecord> selectPageDraftDialogList(@Param("page") Page<CbProjectRecord> page, @Param(Constants.WRAPPER) QueryWrapper<CbProjectRecord> wrapper);
-
 }
 

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

@@ -193,7 +193,7 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
      */
     @Override
     public TableDataInfo<CbProjectRecordSearchVo> getProjectList(CbProjectSearchBo searchBo, PageQuery pageQuery) {
-        Page<CbProjectRecordSearchVo> page = baseMapper.selectPageProjectRecordList(pageQuery.build(), searchBo, CbProjectConstants.DELETE_FLAG_EXIST, CbProjectConstants.PROJECT_FILE_STATUS_PREPARING);
+        Page<CbProjectRecordSearchVo> page = baseMapper.selectPageProjectRecordList(pageQuery.build(), searchBo, CbProjectConstants.DELETE_FLAG_EXIST, CbProjectConstants.PROJECT_FILE_STATUS_PREPARING, CbProjectConstants.CB_STAGE_NO_COST_PLAN);
 
         for (CbProjectRecordSearchVo searchVo : page.getRecords()) {
             //判断是否有历史阶段
@@ -212,8 +212,10 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
                     .eq(CbProjectFile::getProjectId, searchVo.getId())
                     .orderByDesc(CbProjectFile::getUpdateTime)
                     .last("LIMIT 1"));
-            searchVo.setUpdateBy(projectFile.getUpdateBy());
-            searchVo.setUpdateTime(projectFile.getUpdateTime());
+            if (ObjectUtil.isNotNull(projectFile)) {
+                searchVo.setUpdateBy(projectFile.getUpdateBy());
+                searchVo.setUpdateTime(projectFile.getUpdateTime());
+            }
         }
         return TableDataInfo.build(page);
     }

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbProjectRecordMapper.xml

@@ -13,6 +13,8 @@
         cpr.ipm_project_no,
         cpr.is_get_project_detail,
         cpr.project_file_name,
+        cpr.del_flag,
+        cpr.create_by,
         cpr.create_time
         from cb_project_record cpr
         where cpr.del_flag=#{deleteFlagExist}
@@ -30,6 +32,8 @@
         </if>
         and
         cpr.project_file_status != #{projectFileStatusPreparing}
+        or
+        cpr.cb_stage = #{cbStageNoCostPlan}
         order by cpr.cb_stage desc) a
         group by a.related_id
         order by a.create_time desc