From a2945a80c9b05fd35cad451f447d4cedd2bcb0ed Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 30 May 2024 10:52:49 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E6=A0=87=E5=87=86=E5=8C=96=E5=8F=91=E8=B5=B7=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E4=BF=AE=E6=94=B9=E4=B8=89=E4=B8=AA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProcessEsAnnualInit.java | 6 ++-- .../impl/ProcessEsAnnualInitServiceImpl.java | 7 ++-- .../ProcessEsAnnualReportServiceImpl.java | 6 ++-- .../modules/activiti/util/ExcelUtils.java | 31 +++++++++++++----- .../年度制修订计划（标准化发起）导入模板.xls | Bin 20480 -> 20480 bytes 5 files changed, 31 insertions(+), 19 deletions(-) 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 d6f3a427bea75f909fca9ab35ee30381146d0e31..80be4ffbdba1d99373a2de24fae9297aba8434e4 100644 GIT binary patch delta 147 zcmZozz}T>WaYGIZo56ACO%|Ib7qPT4)^7gEGTV&lx#i?()-FsxnJ3?|exS|5z-aAP z-s{=C%a0Yt3=Q`6=RoEt_x|?V<+qvNR)d-8zwKsA2W=KUUIqaM1_nk3ULX_@*j(h& k$2j?bi^e9miL9)An>Jc(+C0shi-pya!HB_f@WaYGIZ+XJ2Txtd**i&)wimu~*aGTV%a-)izSYZoR(mdSUl9|W^9a56Dy zFcUa5BTygCvxDfBPZyF#+{%er}_|%%pC& zS