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

fix(标准法规入库_变更流程): 80628

Browse Source
This commit is contained in:
yjz
2024-01-23 19:49:51 +08:00
parent cc7b078d9c
commit 8a161f9cab
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
+17 -6
View File
@@ -34,9 +34,11 @@ import com.jero.modules.laws.common.util.CurrentUserUtil;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.entity.LawsOverseasStandard; import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
import com.jero.modules.laws.standard.entity.LawsTreeNode;
import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
import com.jero.modules.laws.standard.service.ILawsTreeNodeService;
import com.jero.modules.laws.standardization.entity.LawsStandardization; import com.jero.modules.laws.standardization.entity.LawsStandardization;
import com.jero.modules.laws.standardization.service.ILawsStandardizationService; import com.jero.modules.laws.standardization.service.ILawsStandardizationService;
import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.entity.SysDepart;
@@ -103,6 +105,9 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
@Resource @Resource
private ProcessAllService processAllService; private ProcessAllService processAllService;
@Resource
private ILawsTreeNodeService lawsTreeNodeService;
/** /**
* @Author: liao * @Author: liao
* @Date: 2023/11/2 15:43 * @Date: 2023/11/2 15:43
@@ -538,10 +543,10 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
jsonObject.put("bidding_committee_dictText", !Objects.isNull(lawsStandardization) ? lawsStandardization.getName() : ""); jsonObject.put("bidding_committee_dictText", !Objects.isNull(lawsStandardization) ? lawsStandardization.getName() : "");
} }
// 标准状态 // 标准状态
if (businessJson.contains("standard_status")){ if (businessJson.contains("standard_state")){
Object read = JSONPath.read(businessJson, "$.standard_status"); Object read = JSONPath.read(businessJson, "$.standard_state");
String text = dictService.queryDictText("standard_status", read.toString()); String text = dictService.queryDictText("standard_state", read.toString());
jsonObject.put("standard_status_dictText", text); jsonObject.put("standard_state_dictText", text);
} }
// 标准性质 // 标准性质
if (businessJson.contains("standard_property")){ if (businessJson.contains("standard_property")){
@@ -551,9 +556,15 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
} }
// 标准体系 // 标准体系
if (businessJson.contains("standard_system")){ if (businessJson.contains("standard_system")){
List<String> dicTextList = new ArrayList<>();
Object read = JSONPath.read(businessJson, "$.standard_system"); Object read = JSONPath.read(businessJson, "$.standard_system");
String text = dictService.queryDictText("standard_system", read.toString()); List<String> list = Arrays.asList(read.toString().split(","));
jsonObject.put("standard_system_dictText", text); List<LawsTreeNode> lawsTreeNodeList = lawsTreeNodeService.listByIds(list);
for (String item : list) {
Optional<LawsTreeNode> optional = lawsTreeNodeList.stream().filter(v -> v.getId().equals(item)).findFirst();
optional.ifPresent(v -> dicTextList.add(v.getNodeName()));
}
jsonObject.put("standard_system_dictText", String.join(",", dicTextList));
} }
// 责任部门 // 责任部门
if (businessJson.contains("responsible_department")){ if (businessJson.contains("responsible_department")){