diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java index 5ae0a678..66a4723e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java @@ -223,13 +223,14 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl map = JSON.parseObject(processFbEntryChange.getBusinessJson(), Map.class); // 处理字典翻译 - List fieldList = lawsCommonMapper.getFieldList(TableNameEnum.getTableName(processFbEntryChange.getSource())); + //List fieldList = lawsCommonMapper.getFieldList(TableNameEnum.getTableName(processFbEntryChange.getSource())); // 新增编辑显示 - fieldList = fieldList.stream().filter(lawsTag -> YesOrNoEnum.YES.getValue() - .equals(lawsTag.getIsShowFormCreate().toString())).collect(Collectors.toList()); - Map stringObjectMap = lawsCommonService.processResultMap(map, fieldList); + //fieldList = fieldList.stream().filter(lawsTag -> YesOrNoEnum.YES.getValue() + //.equals(lawsTag.getIsShowFormCreate().toString())).collect(Collectors.toList()); + //Map stringObjectMap = lawsCommonService.processResultMap(map, fieldList); - processFbEntryChange.setBusinessMap(stringObjectMap); + //processFbEntryChange.setBusinessMap(stringObjectMap); + processFbEntryChange.setBusinessMap(map); processInfoVO.setBusinessInfoDTO(processFbEntryChange); return processInfoVO; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java index e8597d47..88912fb4 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java @@ -203,11 +203,13 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl { 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 processInfoVO) { + private void collect(ProcessInfoVO processInfoVO) { ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息 List processFbConsultationLists = businessInfoDTO.getProcessFbConsultationLists(); @@ -284,9 +287,9 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl processInfoVO) { + private void designEngineer(ProcessInfoVO processInfoVO) { ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息 List processFbConsultationLists = businessInfoDTO.getProcessFbConsultationLists();