From ffd5abc74eea1f6ee6433ac11e401aaa57bcc4ab Mon Sep 17 00:00:00 2001 From: yangys <y_ys79@sina.com> Date: 星期二, 08 七月 2025 22:37:50 +0800 Subject: [PATCH] 接口文档描述修改 --- blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java index 55ce39d..969a0ec 100644 --- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java +++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java @@ -37,6 +37,8 @@ import org.springblade.core.oss.model.BladeFile; import org.springblade.mdm.basesetting.machine.MachineService; import org.springblade.mdm.basesetting.machine.entity.Machine; +import org.springblade.mdm.flow.excution.StartDispatcher; +import org.springblade.mdm.flow.service.FlowCommonService; import org.springblade.mdm.program.entity.NcNode; import org.springblade.mdm.program.entity.NcProgram; import org.springblade.mdm.program.entity.ProcessProgRef; @@ -69,7 +71,7 @@ @Service @AllArgsConstructor public class ProcessProgRefService extends BizServiceImpl<ProcessProgRefMapper, ProcessProgRef> { - + private final FlowCommonService flowCommonService; /** * 鏌ヨ鐜版湁鍥哄寲鐨勭▼搴忥紝鏆傚畾鏉′欢锛氶浂缁勪欢鍙风浉鍚岋紝涓旀槸鍚屼竴鏈哄簥缁� * @param processInstanceId 娴佺▼瀹炰緥id @@ -82,13 +84,14 @@ return; } + String processDefinationKey = flowCommonService.getDefinitionKey(processInstanceId); this.lambdaUpdate().eq(ProcessProgRef::getProcessInstanceId, processInstanceId).remove(); List<ProcessProgRef> entities = new ArrayList<>(); for (Long programId : programIds) { ProcessProgRef entity = new ProcessProgRef(); entity.setProcessInstanceId(processInstanceId); entity.setNcProgramId(programId); - + entity.setProcessDefinitionKey(processDefinationKey); entities.add(entity); } this.saveBatch(entities); @@ -109,7 +112,8 @@ */ public ProcessProgRef lastDispatchDataByNcProgramId(Long ncProgramId) { LambdaQueryWrapper<ProcessProgRef> query = Wrappers.lambdaQuery(); - query.eq(ProcessProgRef::getNcProgramId, ncProgramId).orderByDesc(ProcessProgRef::getCreateTime).last("LIMIT 10");; + + query.eq(ProcessProgRef::getNcProgramId, ncProgramId).eq(ProcessProgRef::getProcessDefinitionKey, StartDispatcher.PROCESS_KEY).orderByDesc(ProcessProgRef::getCreateTime).last("LIMIT 1");; List<ProcessProgRef> list = this.list(query); return list.isEmpty() ? null : list.get(0); -- Gitblit v1.9.3