diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java index 2186a7fd..03b28181 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java @@ -321,7 +321,7 @@ public class ProcessEsAnnualInit implements Serializable { /** * 配合单位 */ - @Excel(name = "*配合单位", width = 15, orderNum = "19") + @Excel(name = "配合单位", width = 15, orderNum = "19") @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @ApiModelProperty(value = "配合单位") private String cooperationUnit; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java index c7fd0764..6835d0df 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java @@ -325,7 +325,7 @@ public class ProcessEsAnnualReport implements Serializable { /** * 配合单位 */ - @Excel(name = "*配合单位", width = 15, orderNum = "7") + @Excel(name = "配合单位", width = 15, orderNum = "7") @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @ApiModelProperty(value = "配合单位") private String cooperationUnit; 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 8ceea645..3c038e7c 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 @@ -321,7 +321,7 @@ public class ExcelUtils { public String validCooperateUnit(String value, List listDict) { // 非空检查 if (StrUtil.isBlank(value)) { - return "'配合单位'不能为空。"; + return ""; } // 检查配合单位 if (!excelUtils.validDict("depart_name", value, "sys_depart", "id", false, listDict)) { diff --git a/laws-modules/src/main/resources/excelTemplate/年度制修订计划(各部门主动上报)导入模板.xls b/laws-modules/src/main/resources/excelTemplate/年度制修订计划(各部门主动上报)导入模板.xls index 9dcdcdf8..67366f86 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 a850a677..d6f3a427 100644 Binary files a/laws-modules/src/main/resources/excelTemplate/年度制修订计划(标准化发起)导入模板.xls and b/laws-modules/src/main/resources/excelTemplate/年度制修订计划(标准化发起)导入模板.xls differ