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

fix: 80294 年度制修订计划-各部所联络人 填写/下发任务--列表导入失败提示语不合理

Browse Source
This commit is contained in:
mzaxd
2024-02-07 11:31:53 +08:00
parent b1fcfa1a94
commit e14edac7de
4 changed files with 7 additions and 5 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
+1 -1
View File
@@ -567,7 +567,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
item.setMainDraftingUnit(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getMainDraftingUnit(), listDict));
item.setMainDraftingUnitResponsiblePerson(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getMainDraftingUnitResponsiblePerson(), listDict));
item.setStandardPromoter(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getStandardPromoter(), listDict));
item.setEnStandardSystem(importUtil.convertStandardSystem(item.getEnStandardSystem()));
item.setEnStandardSystem(importUtil.convertStandardSystem(item.getEnStandardSystem(), "3"));
item.setContactUser(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getContactUser(), listDict));
item.setStandardType(excelUtils.translateDictValue("esp_standard_type", item.getStandardType(), listDict));
item.setEnStandardClassification(excelUtils.translateDictValue("standard_grade_classify", item.getEnStandardClassification(), listDict));
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+1 -1
View File
@@ -479,7 +479,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
item.setMainDraftingUnit(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getMainDraftingUnit(), listDict));
item.setMainDraftingUnitResponsiblePerson(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getMainDraftingUnitResponsiblePerson(), listDict));
item.setStandardPromoter(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getStandardPromoter(), listDict));
item.setEnStandardSystem(importUtil.convertStandardSystem(item.getEnStandardSystem()));
item.setEnStandardSystem(importUtil.convertStandardSystem(item.getEnStandardSystem(), "3"));
item.setWorkGroup(excelUtils.translateDictValue("name", "id", "laws_working_group", item.getWorkGroup(), listDict));
item.setStandardType(excelUtils.translateDictValue("esp_standard_type", item.getStandardType(), listDict));
item.setEnStandardClassification(excelUtils.translateDictValue("standard_grade_classify", item.getEnStandardClassification(), listDict));
laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
+1 -1
View File
@@ -407,7 +407,7 @@ public class ExcelUtils {
}
// 检查工作组
if (!excelUtils.validDict("name", value, "laws_working_group", "id", true, listDict)) {
return "'工作组'无效。";
return "'隶属工作组'无效。";
}
return "";
}
laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+4 -2
View File
@@ -419,7 +419,8 @@ public class ImportUtil {
errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 ");
} else {
// 转为id
cellValue = this.convertStandardSystem(cellValue);
String moduleCode = tag.getIsModel();
cellValue = this.convertStandardSystem(cellValue, moduleCode);
}
}
// 文件
@@ -727,10 +728,11 @@ public class ImportUtil {
}
// 体系转换
public String convertStandardSystem(String cellValue) {
public String convertStandardSystem(String cellValue, String moduleCode) {
List<String> valueList = Arrays.asList(cellValue.split(","));
LambdaQueryWrapper<LawsTreeNode> treeNodeLambdaQueryWrapper = new LambdaQueryWrapper<>();
treeNodeLambdaQueryWrapper.in(LawsTreeNode::getNodeName, valueList);
treeNodeLambdaQueryWrapper.eq(LawsTreeNode::getModuleCode, moduleCode);
List<LawsTreeNode> treeNodeList = lawsTreeNodeService.list(treeNodeLambdaQueryWrapper);
Map<String, String> systemMap = treeNodeList.stream().collect(Collectors.toMap(LawsTreeNode::getNodeName, LawsTreeNode::getId));