|
|
@@ -147,7 +147,7 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
|
|
|
}
|
|
|
List<SeekPurchaseByBatch> seekPurchaseByBatchList = new ArrayList<>();
|
|
|
int startRow = 2;
|
|
|
- if (vaidSample(sheet.getRow(startRow))) {
|
|
|
+ if (sheet.getRow(startRow) != null && vaidSample(sheet.getRow(startRow))) {
|
|
|
startRow = 3;
|
|
|
}
|
|
|
for (int r = startRow; r <= rowNum; r++) {
|
|
|
@@ -553,7 +553,7 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
|
|
|
|
|
|
@Override
|
|
|
public Map<String, Object> getImportBomInfo(Long bomId) {
|
|
|
- String sql = "select bom_id,count(bom_id) as successImport,(sum(sp_brand or sp_code or sp_deadline is null)) as nullField "
|
|
|
+ String sql = "select bom_id,count(bom_id) as successImport,(sum((sp_brand is null or sp_code is null or sp_deadline is null))) as nullField "
|
|
|
+ "from trade$seek_purchase_by_batch where bom_id = ? group by bom_id";
|
|
|
try {
|
|
|
Map<String, Object> map = jdbcTemplate.queryForMap(sql, new Object[]{bomId});
|