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/service/impl/CbProjectRecordServiceImpl.java

@@ -177,7 +177,9 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
         for (CbProjectRecordSearchVo searchVo : page.getRecords()) {
             //判断是否有历史阶段
             searchVo.setHasChildren(baseMapper.selectCount(new LambdaQueryWrapper<CbProjectRecord>()
-                    .eq(CbProjectRecord::getRelatedId, searchVo.getRelatedId())) > 1);
+                    .eq(CbProjectRecord::getRelatedId, searchVo.getRelatedId())
+                    .ne(CbProjectRecord::getProjectFileStatus,CbProjectConstants.PROJECT_FILE_STATUS_PREPARING)) > 1
+            );
 
             //关键字标红
             if (StringUtils.isNotBlank(searchBo.getProjectName())) {

dsk-operate-ui/vue.config.js

@@ -35,7 +35,6 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://47.104.91.229:9099/prod-api`,//测试-旧
         target: `http://111.204.34.146:9099/prod-api`,//测试
         // target: `http://192.168.60.5:9098`,//陈跃方
         // target: `http://192.168.60.27:9098`,//邓