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/CbProjectOtherServiceImpl.java

@@ -181,7 +181,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
                     file.setFileParseStatus(3);
                     file.setFailRemark("文件数据不存在");
                     projectFileService.updateById(file);
-                    break;
+                    continue;
                 }
 
                 // 文件名称
@@ -191,7 +191,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
                 Long fileId = file.getId();
                 if ("其他费".equals(name)) {
                     totalDataAnalysis(inputStream, name, file, projectId, cbStage);
-                    break;
+                    continue;
                 }
                 //解析数据
                 ExcelResult<CbProjectOtherImportVo> importVoExcelResult =
@@ -204,7 +204,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
                     file.setFileParseStatus(3);
                     file.setFailRemark("表格中不存在待导入数据!");
                     projectFileService.updateById(file);
-                    break;
+                    continue;
                 }
                 log.debug(">>>>" + importVoList.size());
                 CbProjectOther rootProjectOther = new CbProjectOther();