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

feat: 年度制修订标准化发起导入修改三个字段为非必填

Browse Source
This commit is contained in:
mzaxd
2024-05-30 10:52:49 +08:00
parent 9c773c40f5
commit a2945a80c9
5 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java
+3 -3
View File
@@ -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;
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+3 -4
View File
@@ -619,7 +619,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
String standardSystem = plan.getEnStandardSystem();
String standardType = plan.getStandardType();
String standardClassification = plan.getEnStandardClassification();
String enStandardCode = plan.getEnStandardCode();
String partName = plan.getComponentName();
String draftPlannedCompleteDateString = plan.getDraftPlannedCompleteDateString();
String solicitationDraftPlanCompleteDateString = plan.getSolicitationDraftPlanCompleteDateString();
@@ -632,11 +631,11 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
// 检查制修订类型 编号 名称
errMsg.append(validProjectType(plan, listDict, esList));
// 检查标准等级分类和授权部门
errMsg.append(excelUtils.validAuthDept(authDept, listDict, mainDraftingUnit, standardClassification, authDeptMap, false));
errMsg.append(excelUtils.validAuthDept(authDept, listDict, mainDraftingUnit, standardClassification, authDeptMap, false, false));
// 检查所有数据字典校验的字段
errMsg.append(excelUtils.validCooperateUnit(cooperationUnit, listDict));
errMsg.append(excelUtils.validMainDraftingUser(mainDraftingUser, listDict));
errMsg.append(excelUtils.validMainDraftingUnitResponsiblePerson(mainDraftingUnitResponsiblePerson, listDict));
errMsg.append(excelUtils.validMainDraftingUser(mainDraftingUser, listDict, false));
errMsg.append(excelUtils.validMainDraftingUnitResponsiblePerson(mainDraftingUnitResponsiblePerson, listDict, false));
errMsg.append(excelUtils.validStandardPromoter(standardPromoter, listDict));
errMsg.append(excelUtils.validStandardSystem(standardSystem, listDict, false));
errMsg.append(excelUtils.validContactUser(contactUser, listDict));
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+3 -3
View File
@@ -538,11 +538,11 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
// 检查制修订类型 编号 名称
errMsg.append(validProjectType(plan, listDict, esList));
// 检查标准等级分类和授权部门
errMsg.append(excelUtils.validAuthDept(authDept, listDict, mainDraftingUnit, standardClassification, authDeptMap, false));
errMsg.append(excelUtils.validAuthDept(authDept, listDict, mainDraftingUnit, standardClassification, authDeptMap, false, true));
// 检查所有数据字典校验的字段
errMsg.append(excelUtils.validCooperateUnit(cooperationUnit, listDict));
errMsg.append(excelUtils.validMainDraftingUser(mainDraftingUser, listDict));
errMsg.append(excelUtils.validMainDraftingUnitResponsiblePerson(mainDraftingUnitResponsiblePerson, listDict));
errMsg.append(excelUtils.validMainDraftingUser(mainDraftingUser, listDict, true));
errMsg.append(excelUtils.validMainDraftingUnitResponsiblePerson(mainDraftingUnitResponsiblePerson, listDict, true));
errMsg.append(excelUtils.validStandardPromoter(standardPromoter, listDict));
errMsg.append(excelUtils.validWorkGroup(workGroup, listDict));
errMsg.append(excelUtils.validStandardSystem(standardSystem, listDict, true));
laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
+22 -9
View File
@@ -262,9 +262,10 @@ public class ExcelUtils {
}
public String validAuthDept(String authDept, List<SysDictItemCore> listDict, String mainDraftingUnit,
String standardClassification, Map<String, List<String>> authDeptMap, boolean mustInput) {
String standardClassification, Map<String, List<String>> 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<SysDictItemCore> listDict) {
public String validMainDraftingUser(String value, List<SysDictItemCore> 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<SysDictItemCore> listDict) {
public String validMainDraftingUnit(String value, List<SysDictItemCore> 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<SysDictItemCore> listDict) {
public String validMainDraftingUnitResponsiblePerson(String value, List<SysDictItemCore> 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)) {
laws-modules/src/main/resources/excelTemplate/年度制修订计划（标准化发起）导入模板.xls
BIN
View File
Binary file not shown.