lbqms.git - Gitblit

			@@ -65,4 +65,12 @@
			* @param variables æµç¨åé
			*/
			void setVariablesLocal(String taskId, Map<String, Object> variables);

			/**
			* æç§ä¸å¡idæ¥è¯¢æµç¨å®ä¾id
			*
			* @param businessKey ä¸å¡id
			* @return ç»æ
			*/
			String getInstanceIdByBusinessKey(String businessKey);
			}

			@@ -67,4 +67,10 @@
			@ExcelProperty(value = "ç¶æ")
			private String status;

			/**
			* æµç¨å®ä¾id
			*/
			@ExcelProperty(value = "æµç¨å®ä¾id")
			private String processInstanceId;

			}

			@@ -46,7 +46,9 @@
			*/
			@Override
			public TestLeaveVo queryById(Long id) {
			return baseMapper.selectVoById(id);
			TestLeaveVo testLeaveVo = baseMapper.selectVoById(id);
			testLeaveVo.setProcessInstanceId(workflowService.getInstanceIdByBusinessKey(String.valueOf(id)));
			return testLeaveVo;
			}

			/**

			@@ -1,7 +1,10 @@
			package org.dromara.workflow.service.impl;

			import cn.hutool.core.util.StrUtil;
			import lombok.RequiredArgsConstructor;
			import org.dromara.common.core.service.WorkflowService;
			import org.dromara.workflow.domain.ActHiProcinst;
			import org.dromara.workflow.service.IActHiProcinstService;
			import org.dromara.workflow.service.IActProcessInstanceService;
			import org.dromara.workflow.utils.WorkflowUtils;
			import org.flowable.engine.RuntimeService;
			@@ -21,7 +24,7 @@

			private final IActProcessInstanceService iActProcessInstanceService;
			private final RuntimeService runtimeService;

			private final IActHiProcinstService iActHiProcinstService;
			/**
			* è¿è¡ä¸çå®ä¾ å é¤ç¨å®ä¾ï¼å é¤åå²è®°å½ï¼å é¤ä¸å¡ä¸æµç¨å³èä¿¡æ¯
			*
			@@ -98,4 +101,19 @@
			public void setVariablesLocal(String taskId, Map<String, Object> variables) {
			runtimeService.setVariablesLocal(taskId, variables);
			}

			/**
			* æç§ä¸å¡idæ¥è¯¢æµç¨å®ä¾id
			*
			* @param businessKey ä¸å¡id
			* @return ç»æ
			*/
			@Override
			public String getInstanceIdByBusinessKey(String businessKey) {
			ActHiProcinst actHiProcinst = iActHiProcinstService.selectByBusinessKey(businessKey);
			if (actHiProcinst == null) {
			return StrUtil.EMPTY;
			}
			return actHiProcinst.getId();
			}
			}

Binary files differ

	ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	script/bpmn/模型.zip	补丁 \| 查看 \| 原始文档 \| blame \| 历史