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

update 标准征求意见流程

Browse Source
This commit is contained in:
liao
2023-11-21 16:43:50 +08:00
parent 12dd9c1877
commit 24b336507f
2 changed files with 15 additions and 11 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
+6 -5
View File
@@ -223,13 +223,14 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
Map<String, Object> map = JSON.parseObject(processFbEntryChange.getBusinessJson(), Map.class);
// 处理字典翻译
List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.getTableName(processFbEntryChange.getSource()));
//List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.getTableName(processFbEntryChange.getSource()));
// 新增编辑显示
fieldList = fieldList.stream().filter(lawsTag -> YesOrNoEnum.YES.getValue()
.equals(lawsTag.getIsShowFormCreate().toString())).collect(Collectors.toList());
Map<String, Object> stringObjectMap = lawsCommonService.processResultMap(map, fieldList);
//fieldList = fieldList.stream().filter(lawsTag -> YesOrNoEnum.YES.getValue()
//.equals(lawsTag.getIsShowFormCreate().toString())).collect(Collectors.toList());
//Map<String, Object> stringObjectMap = lawsCommonService.processResultMap(map, fieldList);
processFbEntryChange.setBusinessMap(stringObjectMap);
//processFbEntryChange.setBusinessMap(stringObjectMap);
processFbEntryChange.setBusinessMap(map);
processInfoVO.setBusinessInfoDTO(processFbEntryChange);
return processInfoVO;
}
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+9 -6
View File
@@ -203,11 +203,13 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
case ConsultationTaskKey.DEPART_LEADER_START_1:
processDepartLeaderStart_1(processInfoVO); // 各部所主管级领导分发
break;
case ConsultationTaskKey.DESIGN_ENGINEER_1: // 设计工程师填写征求意见（分发给模块负责人）
case ConsultationTaskKey.DESIGN_ENGINEER_2: // 设计工程师填写征求意见（不分发给模块负责人）
processEngineer_2(processInfoVO);
designEngineer(processInfoVO);
break;
case ConsultationTaskKey.MODULE_OWNER_END_1: // 模块负责人汇总填写意见（可跳过）
case ConsultationTaskKey.DEPART_LEADER_COLLECT_2: // 各部所主管级领导汇总（不分发给模块负责人）
departLeaderCollect_2(processInfoVO);
collect(processInfoVO);
break;
case ConsultationTaskKey.MODULE_OWNER_START: // 模块负责人分发
moduleOwnerStart(processInfoVO);
@@ -242,6 +244,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
designEngineerIdList.forEach(designEngineer -> {
ProcessFbConsultationUserLink userLink = new ProcessFbConsultationUserLink();
userLink.setId(UUIDUtils.randomUUID20());
userLink.setUserType(processFbConsultationUserLink.getUserType());
userLink.setBusinessId(processFbConsultationUserLink.getBusinessId());
userLink.setDepartLeaderId(processFbConsultationUserLink.getDepartLeaderId());
@@ -265,9 +268,9 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
/**
* @Author: liao
* @Date: 2023/11/21 9:39
* @Description: 各部所主管级领导汇总（不分发给模块负责人）
* @Description: 汇总
**/
private void departLeaderCollect_2(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO) {
private void collect(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO) {
ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息
List<ProcessFbConsultationList> processFbConsultationLists = businessInfoDTO.getProcessFbConsultationLists();
@@ -284,9 +287,9 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
/**
* @Author: liao
* @Date: 2023/11/16 15:46
* @Description: 设计工程师填写征求意见（不分发给模块负责人）
* @Description: 设计工程师填写征求意见
**/
private void processEngineer_2(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO) {
private void designEngineer(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO) {
ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息
List<ProcessFbConsultationList> processFbConsultationLists = businessInfoDTO.getProcessFbConsultationLists();