项目台账列表项目bug修复

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

@@ -199,7 +199,8 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
             //判断是否有历史阶段
             searchVo.setHasChildren(baseMapper.selectCount(new LambdaQueryWrapper<CbProjectRecord>()
                     .eq(CbProjectRecord::getRelatedId, searchVo.getRelatedId())
-                    .ne(CbProjectRecord::getProjectFileStatus, CbProjectConstants.PROJECT_FILE_STATUS_PREPARING)) > 1
+                    //.ne(CbProjectRecord::getProjectFileStatus, CbProjectConstants.PROJECT_FILE_STATUS_PREPARING)
+                    ) > 1
             );
 
             //关键字标红
@@ -235,7 +236,7 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
         List<CbProjectRecord> projectRecordList = baseMapper.selectList(new LambdaQueryWrapper<CbProjectRecord>()
                 .eq(CbProjectRecord::getRelatedId, projectRecord.getRelatedId())
                 .ne(CbProjectRecord::getId, projectRecord.getId())
-                .ne(CbProjectRecord::getProjectFileStatus, CbProjectConstants.PROJECT_FILE_STATUS_PREPARING)
+                //.ne(CbProjectRecord::getProjectFileStatus, CbProjectConstants.PROJECT_FILE_STATUS_PREPARING)
                 .like(StringUtils.isNotBlank(searchBo.getProjectName()), CbProjectRecord::getProjectName, searchBo.getProjectName())
                 .eq(StringUtils.isNotBlank(searchBo.getIpmProjectNo()), CbProjectRecord::getIpmProjectNo, searchBo.getIpmProjectNo())
                 .eq(ObjectUtil.isNotNull(searchBo.getCbStage()), CbProjectRecord::getCbStage, searchBo.getCbStage())

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

@@ -36,6 +36,18 @@
         cpr.cb_stage = #{cbStageNoCostPlan}
         and
         cpr.del_flag=#{deleteFlagExist}
+        <if test="searchBo.projectName != null and searchBo.projectName != ''">
+            and cpr.project_name like concat('%',#{searchBo.projectName},'%')
+        </if>
+        <if test="searchBo.ipmProjectNo != null and searchBo.ipmProjectNo != ''">
+            and cpr.ipm_project_no = #{searchBo.ipmProjectNo}
+        </if>
+        <if test="searchBo.cbStage != null">
+            and cpr.cb_stage = #{searchBo.cbStage}
+        </if>
+        <if test="searchBo.projectFileStatus != null">
+            and project_file_status = #{searchBo.projectFileStatus}
+        </if>
         order by cpr.cb_stage desc) a
         group by a.related_id
         order by a.create_time desc