From d5ac4d8f5c68afe23b0238b11c450e8bb0e24672 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 22 Apr 2022 17:18:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/login/security/WebMvcConfig.java | 1 + .../processModel/utils/ExcelImportUtilByWk.java | 2 +- .../impl/SarLawsDetailedListServiceImpl.java | 17 ++++++++++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 06e28756..3a8f8315 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -126,6 +126,7 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarNew"); addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarWaterMarkNew"); addInterceptor.excludePathPatterns("/api/att/attFile/uploadNew"); + addInterceptor.excludePathPatterns("/api/sarLawsDetailedList/sar-laws-detailed-list/importData"); //// //测试接口使用 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelImportUtilByWk.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelImportUtilByWk.java index be89c953..19517039 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelImportUtilByWk.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelImportUtilByWk.java @@ -115,7 +115,7 @@ public class ExcelImportUtilByWk { }else { String value = convertCellValueToString(cell); if (StringUtils.isBlank(value)){ - nums++; + value=""; } map.get(a).set(o, value); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 5cc12ef8..220f3df3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -819,7 +819,22 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl { dict.put(stringStringMap.get("label"),stringStringMap.get("value")); }); - + if (null==res){ + stringBuilder.append("请误导入空文件；"); + } + //先校验是否存在一堆空数据 + if (null != res && "".equals(stringBuilder.toString())) { + int i=1; + for (ExportEmptyModel e:res) { + if (null==e.getStandNumber() || e.getStandNumber().isEmpty()){ + stringBuilder.append("第"+i+"行标准编号不能为空；"); + } + if (null==e.getSyrz() || e.getSyrz().isEmpty()){ + stringBuilder.append("第"+i+"行适用认证不能为空；"); + } + i++; + } + } //数据校验 先做重复交验+再做是否存在校验 if (null != res && "".equals(stringBuilder.toString())) { for (int i = 0; i