diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java index 74dc881f..af40a6f2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java @@ -667,7 +667,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl 50) { - errMsg.append("'新企标名称'过长(最多50字)。"); - } + errMsg.append(excelUtils.validStandardName(newEnStandardName)); return errMsg.toString(); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java index 74d94d8f..898db8df 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java @@ -503,7 +503,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl 50) { - errMsg.append("'新企标名称'过长(最多50字)。"); - } + errMsg.append(excelUtils.validStandardName(newEnStandardName)); return errMsg.toString(); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java index 46747dab..ac8dfe59 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java @@ -10,6 +10,7 @@ import com.jero.modules.laws.common.util.ImportUtil; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.system.entity.SysDictItem; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; @@ -77,7 +78,7 @@ public class ExcelUtils { public static List getHeaderFromExcel(InputStream is, Integer index) throws Exception { List headers = new ArrayList<>(); - Workbook workbook = new XSSFWorkbook(is); + Workbook workbook = new HSSFWorkbook(is); Sheet sheet = workbook.getSheetAt(0); // HeadRow在index 1 @@ -403,4 +404,14 @@ public class ExcelUtils { } return ""; } + + public String validStandardName(String value) { + if (StrUtil.isBlank(value)) { + return "新企标名称不能为空"; + } + if (value.length() > 50) { + return "'新企标名称'过长(最多50字)。"; + } + return ""; + } } diff --git a/laws-modules/src/main/resources/excelTemplate/年度制修订计划(各部门主动上报)导入模板.xls b/laws-modules/src/main/resources/excelTemplate/年度制修订计划(各部门主动上报)导入模板.xls index f22389da..dc2bd173 100644 Binary files a/laws-modules/src/main/resources/excelTemplate/年度制修订计划(各部门主动上报)导入模板.xls and b/laws-modules/src/main/resources/excelTemplate/年度制修订计划(各部门主动上报)导入模板.xls differ diff --git a/laws-modules/src/main/resources/excelTemplate/年度制修订计划(标准化发起)导入模板.xls b/laws-modules/src/main/resources/excelTemplate/年度制修订计划(标准化发起)导入模板.xls index dce9dd3e..ebc1b2af 100644 Binary files a/laws-modules/src/main/resources/excelTemplate/年度制修订计划(标准化发起)导入模板.xls and b/laws-modules/src/main/resources/excelTemplate/年度制修订计划(标准化发起)导入模板.xls differ