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/component/DataAnalysisComponent.java

@@ -105,6 +105,7 @@ public class DataAnalysisComponent {
                             throw new ServiceException("数据插入失败！");
                         }
                         file.setFileParseStatus(2);
+                        file.setFailRemark("");
                         boolean b = projectFileService.updateById(file);
                         if (!b) {
                             throw new ServiceException("文件状态更新失败！");

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

@@ -218,6 +218,8 @@ public class CbDirectExpenseServiceImpl extends ServiceImpl<CbDirectExpenseMappe
                     }
                     //更新文件状态
                     projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_SUCCESS);
+                    //场景:若第一次解析失败了,用户未删除失败的文件,又解析一次,这时解析成功了,因此将失败备注置空
+                    projectFile.setFailRemark(null);
                     Assert.isTrue(projectFileMapper.updateById(projectFile) > 0, "解析成功后文件状态更新失败");
                 } catch (Exception e) {
                     status.setRollbackOnly();

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

@@ -114,6 +114,8 @@ public class CbProjectExpenseSummaryServiceImpl extends ServiceImpl<CbProjectExp
                     Assert.isTrue(impl.saveBatch(summaryList), "数据插入失败");
                     //更新文件状态
                     projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_SUCCESS);
+                    //场景:若第一次解析失败了,用户未删除失败的文件,又解析一次,这时解析成功了,因此将失败备注置空
+                    projectFile.setFailRemark(null);
                     Assert.isTrue(projectFileMapper.updateById(projectFile) > 0, "解析成功后文件状态更新失败");
                 } catch (Exception e) {
                     status.setRollbackOnly();

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

@@ -473,12 +473,13 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
                 }
             }
 
-            //所有文件遍历完后，如果存在解析失败的文件，则项目的解析状态改为解析失败,否则改为解析成功
             if (failNum > 0) {
+                //如果存在解析失败的文件，则项目的解析状态改为解析失败
                 log.info("项目台账列表:ID为" + projectRecord.getId() + "的项目解析失败");
                 projectRecord.setProjectFileStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
                 baseMapper.updateById(projectRecord);
             } else {
+                //否则改为解析成功
                 log.info("项目台账列表:ID为" + projectRecord.getId() + "的项目解析成功");
                 projectRecord.setProjectFileStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_SUCCESS);
                 baseMapper.updateById(projectRecord);

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

@@ -168,6 +168,8 @@ public class CbSceneExpenseChildrenServiceImpl extends ServiceImpl<CbSceneExpens
                     Assert.isTrue(impl.saveBatch(BeanUtil.copyToList(chidrenList, CbSceneExpenseChildren.class)), "数据插入失败");
                     //更新文件状态
                     projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_SUCCESS);
+                    //场景:若第一次解析失败了,用户未删除失败的文件,又解析一次,这时解析成功了,因此将失败备注置空
+                    projectFile.setFailRemark(null);
                     Assert.isTrue(projectFileMapper.updateById(projectFile) > 0, "解析成功后文件状态更新失败");
                 } catch (Exception e) {
                     status.setRollbackOnly();

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

@@ -76,6 +76,7 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
 
         //解析数据
         cbProjectFiles.forEach(cbProjectFile -> {
+            cbProjectFile.setFailRemark(null);
 //            if (cbProjectFile.getDelFlag() == 1) {
 //                //根据fileId删除相关基础数据，并删除文件
 //                baseMapper.delete(new LambdaQueryWrapper<CbSummary>().eq(CbSummary::getCbProjectFileId, cbProjectFile.getId()));

dsk-operate-ui/.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = 中建一局集团第二建筑有限公司
 ENV = 'development'
 
 # 数字化经营履约全生命链路管理系统/开发环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'http://localhost:9098'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

dsk-operate-ui/package.json

@@ -5,7 +5,7 @@
   "author": "若依",
   "license": "MIT",
   "scripts": {
-    "dev": "vue-cli-service serve",
+    "dev": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service serve",
     "devmac": "export NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
     "build:prod": "vue-cli-service build",
     "build:test": "vue-cli-service build --mode test",