Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

This commit is contained in:
gaojiabao
2023-04-12 09:49:40 +08:00
@@ -2132,6 +2132,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//获取总条数 //获取总条数
int rowNum = sheet.getPhysicalNumberOfRows(); int rowNum = sheet.getPhysicalNumberOfRows();
int count = 2;
//循环遍历 //循环遍历
for (int i = 1; i <= rowNum; i++) { for (int i = 1; i <= rowNum; i++) {
row = sheet.getRow(i); row = sheet.getRow(i);
@@ -2177,7 +2178,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
} }
if (i != 0 && i != 1 && !rowList.equals("") && rowList != null ) { if (i != 0 && i != 1 && !rowList.equals("") && rowList != null ) {
int count = 2;
count++; count++;
String standSort = rowList.get("*企标类别"); String standSort = rowList.get("*企标类别");