From 95b1f7b2b35872444acf8e85cc236682d0c4e47e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 04 八月 2025 11:08:06 +0800
Subject: [PATCH] 分工表加入重复图号的校验
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 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 1b5ac3b..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
@@ -25,6 +25,7 @@
*/
package org.springblade.mdm.program.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
@@ -36,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;
@@ -68,7 +71,7 @@
@Service
@AllArgsConstructor
public class ProcessProgRefService extends BizServiceImpl<ProcessProgRefMapper, ProcessProgRef> {
-
+ private final FlowCommonService flowCommonService;
/**
* 鏌ヨ鐜版湁鍥哄寲鐨勭▼搴忥紝鏆傚畾鏉′欢锛氶浂缁勪欢鍙风浉鍚岋紝涓旀槸鍚屼竴鏈哄簥缁�
* @param processInstanceId 娴佺▼瀹炰緥id
@@ -81,17 +84,38 @@
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);
}
+ /**
+ * 鏌ヨ娴佺▼鍏宠仈鐨勭▼搴�
+ * @param processInstanceId
+ * @return
+ */
+ public List<NcProgramVO> listByProcess(String processInstanceId) {
+ return this.getBaseMapper().listByProcess(processInstanceId);
+ }
+ /**
+ *鑾峰彇鏈�鍚庝竴璋冧换鍔″垎娲剧殑鏁版嵁锛屾牴鎹▼搴廼d
+ * @param ncProgramId 鏁版帶绋嬪簭id
+ */
+ public ProcessProgRef lastDispatchDataByNcProgramId(Long ncProgramId) {
+ LambdaQueryWrapper<ProcessProgRef> query = Wrappers.lambdaQuery();
+
+ 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