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 03b28181..0a2f35ae 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 @@ -262,7 +262,7 @@ public class ProcessEsAnnualInit implements Serializable { /** * 主起草人 */ - @Excel(name = "*主起草人", width = 15, orderNum = "15") + @Excel(name = "主起草人", width = 15, orderNum = "15") @Dict(dicCode = "id", dictTable = "sys_user", dicText = "CONCAT(realname, '(', username, ')')") @ApiModelProperty(value = "主起草人") private String mainDraftingUser; @@ -270,7 +270,7 @@ public class ProcessEsAnnualInit implements Serializable { /** * 主起草单位 */ - @Excel(name = "*主起草单位", width = 15, orderNum = "16") + @Excel(name = "主起草单位", width = 15, orderNum = "16") @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @ApiModelProperty(value = "主起草单位") private String mainDraftingUnit; @@ -278,7 +278,7 @@ public class ProcessEsAnnualInit implements Serializable { /** * 主起草单位责任人 */ - @Excel(name = "*主起草单位责任人", width = 20, orderNum = "17") + @Excel(name = "主起草单位责任人", width = 20, orderNum = "17") @Dict(dicCode = "id", dictTable = "sys_user", dicText = "CONCAT(realname, '(', username, ')')") @ApiModelProperty(value = "主起草单位责任人") private String mainDraftingUnitResponsiblePerson; 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 02622b4f..e12f6422 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 @@ -619,7 +619,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl listDict, String mainDraftingUnit, - String standardClassification, Map> authDeptMap, boolean mustInput) { + String standardClassification, Map> authDeptMap, + boolean authDeptMustInput, boolean mainDraftUnitMustInput) { // 先校验主起草部门 - String validResult = this.validMainDraftingUnit(mainDraftingUnit, listDict); + String validResult = this.validMainDraftingUnit(mainDraftingUnit, listDict, mainDraftUnitMustInput); if (StrUtil.isNotBlank(validResult)) { return validResult; } @@ -286,7 +287,7 @@ public class ExcelUtils { String level = translateDictValue("standard_grade_classify", standardClassification, listDict); if (StrUtil.isBlank(authDept)) { - if (mustInput) { + if (authDeptMustInput) { return "'授权部门'不能为空。"; } else { return ""; @@ -330,9 +331,13 @@ public class ExcelUtils { return ""; } - public String validMainDraftingUser(String value, List listDict) { + public String validMainDraftingUser(String value, List listDict, boolean mustInput) { if (StrUtil.isBlank(value)) { - return "'主起草人'不能为空。"; + if (mustInput) { + return "'主起草人'不能为空。"; + } else { + return ""; + } } // 检查主起草人 @@ -342,9 +347,13 @@ public class ExcelUtils { return ""; } - public String validMainDraftingUnit(String value, List listDict) { + public String validMainDraftingUnit(String value, List listDict, boolean mustInput) { if (StrUtil.isBlank(value)) { - return "'主起草单位'不能为空。"; + if (mustInput) { + return "'主起草单位'不能为空。"; + } else { + return ""; + } } // 检查主起草单位 if (!excelUtils.validDict("depart_name", value, "sys_depart", "id", true, listDict)) { @@ -353,9 +362,13 @@ public class ExcelUtils { return ""; } - public String validMainDraftingUnitResponsiblePerson(String value, List listDict) { + public String validMainDraftingUnitResponsiblePerson(String value, List listDict, boolean mustInput) { if (StrUtil.isBlank(value)) { - return "'主起草单位负责人'不能为空。"; + if (mustInput) { + return "'主起草单位负责人'不能为空。"; + } else { + return ""; + } } // 检查主起草单位负责人 if (!excelUtils.validDict("CONCAT(realname, '(', username, ')')", value, "sys_user", "id", true, listDict)) { diff --git a/laws-modules/src/main/resources/excelTemplate/年度制修订计划(标准化发起)导入模板.xls b/laws-modules/src/main/resources/excelTemplate/年度制修订计划(标准化发起)导入模板.xls index d6f3a427..80be4ffb 100644 Binary files a/laws-modules/src/main/resources/excelTemplate/年度制修订计划(标准化发起)导入模板.xls and b/laws-modules/src/main/resources/excelTemplate/年度制修订计划(标准化发起)导入模板.xls differ