diff --git a/project/src/main/java/com/sdm/project/model/req/KeyResultReq.java b/project/src/main/java/com/sdm/project/model/req/KeyResultReq.java index 8a24f83a..8dbbd79b 100644 --- a/project/src/main/java/com/sdm/project/model/req/KeyResultReq.java +++ b/project/src/main/java/com/sdm/project/model/req/KeyResultReq.java @@ -72,7 +72,7 @@ public class KeyResultReq extends BaseReq { private MultipartFile file; @Schema(description = "是否仅曲线上传文件") - private boolean onlyFile; + private boolean onlyFile = false; /** * -------------------------------------------------上传交付物使用参数------------------------------------------------ diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java index 73f2cf64..68541fb2 100644 --- a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java @@ -578,6 +578,8 @@ public class SimulationRunServiceImpl extends ServiceImpl flowTemplateResp = flowFeignClient.queryFlowTemplateInfo(simulationRun.getFlowTemplate()); if (flowTemplateResp.getData() != null) { + simulationRun.setProcessDefinitionId(flowTemplateResp.getData().getProcessDefinitionId()); + this.updateById(simulationRun); try { List flowNodeDtoList = new ArrayList<>(); ProcessDefinitionDTO definitionDTO = JSON.parseObject(flowTemplateResp.getData().getTemplateContent(), ProcessDefinitionDTO.class); @@ -609,12 +611,23 @@ public class SimulationRunServiceImpl extends ServiceImpl parentResp = flowableFeignClient.getProcessAndNodeDetailByInstanceId(parentRun.getProcessDefinitionId(), parentRun.getFlowInstanceId(), parentRun.getUuid()); + if (parentResp.getData() != null && CollectionUtils.isNotEmpty(parentResp.getData().getNodes())) { + for (FlowNodeDto flowNodeDto : flowNodeDtoList) { + parentResp.getData().getNodes().stream().filter(i -> StringUtils.equals(i.getId(), flowNodeDto.getNodeId()) && ObjectUtils.isNotEmpty(i.getUserParam())).findFirst().ifPresent(i -> { + Map params = new HashMap<>(i.getUserParam()); + flowableFeignClient.saveParamsByDefinitionId(simulationRun.getProcessDefinitionId(), flowNodeDto.getNodeId(), simulationRun.getUuid(), params); + }); + } + } + } } catch (Exception e) { log.error("解析流程模板json文件失败,flowTemplateId:{}", simulationRun.getFlowTemplate(), e); throw new RuntimeException("解析流程模板json文件失败:" + e.getMessage(), e); } - simulationRun.setProcessDefinitionId(flowTemplateResp.getData().getProcessDefinitionId()); - this.updateById(simulationRun); } } return SdmResponse.success(simulationRun.getUuid()); diff --git a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java index 7c601a7b..f1d0f09c 100644 --- a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java @@ -366,7 +366,7 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS queryWrapper.eq(SysFormConfigure::getTenantId, ThreadLocalContext.getTenantId()); List list = formConfigureService.list(queryWrapper); if (CollectionUtils.isEmpty(list)) { - return SdmResponse.failed("自定义表单列表为空,请初始化"); + return SdmResponse.success(); } PageInfo page = new PageInfo<>(list);