添加错误信息

gic-store-web/src/main/java/com/gic/store/web/controller/StoreImportController.java

@@ -139,10 +139,10 @@ public class StoreImportController {
                     ServiceResponse<List<List<String>>> titleServiceResponse = storeImportApiService.listImportTitle(enterpriseId, storeRegion.getRegionId());
                     List<String> titleList = titleServiceResponse.getResult().get(0);
                     // todo 这里在测试完成后放开
-//                    if (CollectionUtils.isNotEmpty(data) && titleList.size() != data.get(0).size()) {
-//                        return RestResponse.failure(ErrorCode.ERR_7.getCode(), "总列数与模板不一致");
-//                    }
-//                    storeImportApiService.delStoreTmp(enterpriseId);
+                    if (CollectionUtils.isNotEmpty(data) && titleList.size() != data.get(0).size()) {
+                        return RestResponse.failure(ErrorCode.ERR_7.getCode(), "总列数与模板不一致");
+                    }
+                    storeImportApiService.delStoreTmp(enterpriseId);
                     for (Map<Integer, String> row : data) {
                         StoreTmpDTO bean = this.validateData(row, enterpriseId, storeRegion.getRegionId());
                         bean.setRegionId(storeRegion.getRegionId());
@@ -489,8 +489,9 @@ public class StoreImportController {
         XSSFSheet sheet = workbook.getSheetAt(0);
         XSSFRow row = sheet.getRow(0);
         XSSFCell cell = row.getCell(0);
-        cell.setCellType(Cell.CELL_TYPE_NUMERIC);
-        ServiceResponse<StoreRegionDTO> serviceResponse = storeRegionApiService.getStoreRegionByRegion(enterpriseId, (int) cell.getNumericCellValue());
+        cell.setCellType(Cell.CELL_TYPE_STRING);
+        String value = cell.getStringCellValue();
+        ServiceResponse<StoreRegionDTO> serviceResponse = storeRegionApiService.getStoreRegionByRegion(enterpriseId, Integer.valueOf(value));
         return serviceResponse.isSuccess() ? serviceResponse.getResult() : null;
     }