ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 80016 年度制修订-各部门主动上报：导入表格按照模板填写，导入一直提示导入失败

Browse Source
This commit is contained in:
mzaxd
2024-01-24 16:46:20 +08:00
parent 5d12d69cde
commit 3c05c87ea3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+2 -2
View File
@@ -458,7 +458,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
try { try {
headers = ExcelUtils.getHeaderFromExcel(file.getInputStream(), 0); headers = ExcelUtils.getHeaderFromExcel(file.getInputStream(), 0);
} catch (Exception e) { } catch (Exception e) {
errorMsgs.add("导入模板错误。"); errorMsgs.add("模板错误，请按照系统模板导入！");
resultMap.put("msg", errorMsgs); resultMap.put("msg", errorMsgs);
resultMap.put("flag", YesOrNoEnum.NO.getValue()); resultMap.put("flag", YesOrNoEnum.NO.getValue());
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
@@ -468,7 +468,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
// 使用静态方法验证header // 使用静态方法验证header
boolean isMatched = headers.equals(ExcelUtils.getSortedHeadersFromClass(ProcessEsAnnualInit.class)); boolean isMatched = headers.equals(ExcelUtils.getSortedHeadersFromClass(ProcessEsAnnualInit.class));
if (!isMatched) { if (!isMatched) {
errorMsgs.add("导入模板错误。"); errorMsgs.add("模板错误，请按照系统模板导入！");
resultMap.put("msg", errorMsgs); resultMap.put("msg", errorMsgs);
resultMap.put("flag", YesOrNoEnum.NO.getValue()); resultMap.put("flag", YesOrNoEnum.NO.getValue());
return resultMap; // 返回错误信息 return resultMap; // 返回错误信息
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+2 -2
View File
@@ -339,7 +339,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
try { try {
headers = ExcelUtils.getHeaderFromExcel(file.getInputStream(), 0); headers = ExcelUtils.getHeaderFromExcel(file.getInputStream(), 0);
} catch (Exception e) { } catch (Exception e) {
errorMsgs.add("导入模板错误。"); errorMsgs.add("模板错误，请按照系统模板导入！");
resultMap.put("msg", errorMsgs); resultMap.put("msg", errorMsgs);
resultMap.put("flag", YesOrNoEnum.NO.getValue()); resultMap.put("flag", YesOrNoEnum.NO.getValue());
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
@@ -349,7 +349,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
// 使用静态方法验证header // 使用静态方法验证header
boolean isMatched = headers.equals(ExcelUtils.getSortedHeadersFromClass(ProcessEsAnnualReport.class)); boolean isMatched = headers.equals(ExcelUtils.getSortedHeadersFromClass(ProcessEsAnnualReport.class));
if (!isMatched) { if (!isMatched) {
errorMsgs.add("导入模板错误。"); errorMsgs.add("模板错误，请按照系统模板导入！");
resultMap.put("msg", errorMsgs); resultMap.put("msg", errorMsgs);
resultMap.put("flag", YesOrNoEnum.NO.getValue()); resultMap.put("flag", YesOrNoEnum.NO.getValue());
return resultMap; // 返回错误信息 return resultMap; // 返回错误信息