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/listener/CbProjectOtherImportListener.java

@@ -44,10 +44,10 @@ public class CbProjectOtherImportListener extends AnalysisEventListener<CbProjec
 //            failureMsg.append("<br/>" + rowIndex + "行 解析失败：清单内容不能为空");
 //        }
         String number = importVo.getNumber();
-        if (StrUtil.isEmpty(number)) {
-            failureNum++;
-            failureMsg.append("<br/>" + rowIndex + "行 解析失败：序号不能为空");
-        }
+//        if (StrUtil.isEmpty(number)) {
+//            failureNum++;
+//            failureMsg.append("<br/>" + rowIndex + "行 解析失败：序号不能为空");
+//        }
 
         importVo.setCbProjectFileId(fileId);
         Boolean numberMatch = false;
@@ -57,10 +57,11 @@ public class CbProjectOtherImportListener extends AnalysisEventListener<CbProjec
 
         if (ReUtil.isMatch(regex, number) || ReUtil.isMatch(pattern, number)||ReUtil.isMatch(pattern3, number)) {
             numberMatch = true;
-        } else {
-            failureNum++;
-            failureMsg.append("<br/>" + rowIndex + "行 解析失败：序号格式错误");
         }
+//        else {
+//            failureNum++;
+//            failureMsg.append("<br/>" + rowIndex + "行 解析失败：序号格式错误");
+//        }
         if(numberMatch){
             if (ReUtil.isMatch(regex, number)){
                 String replace = number.replaceAll("[\\\\(（]|[\\\\)）]", "");

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

@@ -246,6 +246,8 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
                 }
 
             }
+            file.setFileParseStatus(2);
+            projectFileService.updateById(file);
         }
     }
 
@@ -279,6 +281,8 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
                 projectExpenseSummaryService.save(projectExpenseSummary);
             }
         }
+        file.setFileParseStatus(2);
+        projectFileService.updateById(file);
     }
 
     /**