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

Merge remote-tracking branch 'origin/thirdStage' into thirdStage

Browse Source
This commit is contained in:
yjz
2024-01-24 16:01:26 +08:00
parent 37a1255de7 79bf382bca
commit 86f8987256
3 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+7 -13
View File
@@ -612,11 +612,11 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
errMsg.append(excelUtils.validMainDraftingUnit(mainDraftingUnit, listDict));
errMsg.append(excelUtils.validMainDraftingUnitResponsiblePerson(mainDraftingUnitResponsiblePerson, listDict));
errMsg.append(excelUtils.validStandardPromoter(standardPromoter, listDict));
errMsg.append(excelUtils.validStandardSystem(standardSystem, listDict));
errMsg.append(excelUtils.validStandardSystem(standardSystem, listDict, false));
errMsg.append(excelUtils.validContactUser(contactUser, listDict));
errMsg.append(excelUtils.validStandardType(standardType, listDict));
errMsg.append(excelUtils.validStandardType(standardType, listDict, false));
errMsg.append(excelUtils.validStandardCode(enStandardCode, listDict));
errMsg.append(excelUtils.validPartName(partName, listDict));
errMsg.append(excelUtils.validPartName(partName, listDict, false));
errMsg.append(excelUtils.validSingleDateNotBeforeToday(draftPlannedCompleteDateString, "草稿计划完成日期"));
errMsg.append(excelUtils.validSingleDateNotBeforeToday(solicitationDraftPlanCompleteDateString, "征求意见稿计划完成日期"));
errMsg.append(excelUtils.validSingleDateNotBeforeToday(planApprovalDateString, "计划报批日期"));
@@ -641,6 +641,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
}
// 修订
if (projectType.equals(ESPProjectType.MODIFY.getName())) {
errMsg.append(excelUtils.validStandardName(newEnStandardName));
// 检查企标编号是否有效
if (StrUtil.isBlank(originEnStandardNo)) {
errMsg.append("'原企标编号'不能为空。");
@@ -655,32 +656,25 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
String enNameCode = plan.getEnNameCode();
String standardCategoryCode = plan.getStandardCategoryCode();
// 检查企标编号是否有效
if (StrUtil.isBlank(enStandardCode)) {
errMsg.append("'企业标准代号'不能为空。");
} else {
if (StrUtil.isNotBlank(enStandardCode)) {
// 检查企业标准代号
if (!excelUtils.validDict("enterprise_standard_code", enStandardCode, null, null, true, listDict)) {
errMsg.append("'企业标准代号'无效。");
}
}
if (StrUtil.isBlank(enNameCode)) {
errMsg.append("'企业名称代号'不能为空。");
} else {
if (StrUtil.isNotBlank(enNameCode)) {
// 检查企业标准代号
if (!excelUtils.validDict("enterprise_name_code", enNameCode, null, null, true, listDict)) {
errMsg.append("'企业名称代号'无效。");
}
}
if (StrUtil.isBlank(standardCategoryCode)) {
errMsg.append("'标准类别代号'不能为空。");
} else {
if (StrUtil.isNotBlank(standardCategoryCode)) {
// 检查企业标准代号
if (!excelUtils.validDict("standard_category_code", standardCategoryCode, null, null, true, listDict)) {
errMsg.append("'标准类别代号'无效。");
}
}
}
errMsg.append(excelUtils.validStandardName(newEnStandardName));
return errMsg.toString();
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+2 -2
View File
@@ -490,8 +490,8 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
errMsg.append(excelUtils.validMainDraftingUnitResponsiblePerson(mainDraftingUnitResponsiblePerson, listDict));
errMsg.append(excelUtils.validStandardPromoter(standardPromoter, listDict));
errMsg.append(excelUtils.validWorkGroup(workGroup, listDict));
errMsg.append(excelUtils.validStandardSystem(standardSystem, listDict));
errMsg.append(excelUtils.validStandardType(standardType, listDict));
errMsg.append(excelUtils.validStandardSystem(standardSystem, listDict, true));
errMsg.append(excelUtils.validStandardType(standardType, listDict, true));
errMsg.append(excelUtils.validSingleDateMustInputNotBeforeToday(draftPlannedCompleteDateString, "草稿计划完成日期"));
errMsg.append(excelUtils.validSingleDateMustInputNotBeforeToday(solicitationDraftPlanCompleteDateString, "征求意见稿计划完成日期"));
errMsg.append(excelUtils.validSingleDateMustInputNotBeforeToday(planApprovalDateString, "计划报批日期"));
laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
+22 -6
View File
@@ -245,10 +245,14 @@ public class ExcelUtils {
return textValue.toString();
}
public String validStandardType(String value, List<SysDictItemCore> listDict) {
public String validStandardType(String value, List<SysDictItemCore> listDict, boolean mustInput) {
// 非空检查
if (StrUtil.isBlank(value)) {
return "'标准类型'不能为空。";
if (mustInput) {
return "'标准类型'不能为空。";
} else {
return "";
}
}
// 检查授权部门
if (!excelUtils.validDict("esp_standard_type", value, null, null, true, listDict)) {
@@ -259,6 +263,10 @@ public class ExcelUtils {
public String validAuthDept(String authDept, List<SysDictItemCore> listDict,
String standardClassification, Map<String, List<String>> authDeptMap) {
if (StrUtil.isBlank(authDept) && StrUtil.isBlank(standardClassification)) {
return "";
}
if (StrUtil.isBlank(standardClassification)) {
return "'标准等级分类'不能为空。";
}
@@ -365,9 +373,13 @@ public class ExcelUtils {
return "";
}
public String validStandardSystem(String value, List<SysDictItemCore> listDict) {
public String validStandardSystem(String value, List<SysDictItemCore> listDict, boolean mustInput) {
if (StrUtil.isBlank(value)) {
return "'标准体系'不能为空。";
if (mustInput) {
return "'标准体系'不能为空。";
} else {
return "";
}
}
// 检查主起草人
if (!excelUtils.validDict("node_name", value, "laws_tree_node", "id", false, listDict)) {
@@ -414,9 +426,13 @@ public class ExcelUtils {
return "";
}
public String validPartName(String value, List<SysDictItemCore> listDict) {
public String validPartName(String value, List<SysDictItemCore> listDict, boolean mustInput) {
if (StrUtil.isBlank(value)) {
return "零部件名称不能为空。";
if (mustInput) {
return "'零部件名称'不能为空。";
} else {
return "";
}
}
// 检查工作组
if (!excelUtils.validDict("part_name", value, null, null, true, listDict)) {