From d9c0d420a7a3e7bf4d43d6d49935c87953b635b6 Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Wed, 18 Dec 2024 09:25:46 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1id=E6=9F=A5=E8=AF=A2=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlwCategoryController.java | 4 +--- .../controller/FlwInstanceController.java | 10 ++++++++++ .../workflow/service/IFlwInstanceService.java | 20 +++++++++++++------ .../service/impl/FlwInstanceServiceImpl.java | 20 +++++++++++++++++++ .../mapper/workflow/FlwInstanceMapper.xml | 1 - 5 files changed, 45 insertions(+), 10 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java index 3f9da6349..99fa064df 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java @@ -117,12 +117,10 @@ public class FlwCategoryController extends BaseController { return toAjax(flwCategoryService.deleteWithValidById(categoryId)); } - - /** * 获取流程分类树列表 * - * @param categoryBo 参数 + * @param categoryBo 流程分类 */ @GetMapping("/categoryTree") public R>> categoryTree(FlowCategoryBo categoryBo) { diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java index aeb4f20f3..2da037378 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java @@ -55,6 +55,16 @@ public class FlwInstanceController extends BaseController { return flwInstanceService.selectFinishInstanceList(flowInstanceBo, pageQuery); } + /** + * 根据业务id查询流程实例详细信息 + * + * @param businessId 业务id + */ + @GetMapping("/getInfo/{businessId}") + public R getInfo(@PathVariable Long businessId) { + return R.ok(flwInstanceService.queryByBusinessId(businessId)); + } + /** * 按照业务id删除流程实例 * diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java index 81c244ab2..97d84a280 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java @@ -21,8 +21,8 @@ public interface IFlwInstanceService { /** * 分页查询正在运行的流程实例 * - * @param flowInstanceBo 参数 - * @param pageQuery 分页 + * @param flowInstanceBo 流程实例 + * @param pageQuery 分页 * @return 结果 */ TableDataInfo selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery); @@ -30,12 +30,20 @@ public interface IFlwInstanceService { /** * 分页查询已结束的流程实例 * - * @param flowInstanceBo 参数 - * @param pageQuery 分页 + * @param flowInstanceBo 流程实例 + * @param pageQuery 分页 * @return 结果 */ TableDataInfo selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery); + /** + * 根据业务id查询流程实例详细信息 + * + * @param businessId 业务id + * @return 结果 + */ + FlowInstanceVo queryByBusinessId(Long businessId); + /** * 按照业务id查询流程实例 * @@ -87,7 +95,7 @@ public interface IFlwInstanceService { /** * 获取当前登陆人发起的流程实例 * - * @param instanceBo 参数 + * @param instanceBo 流程实例 * @param pageQuery 分页 * @return 结果 */ @@ -144,7 +152,7 @@ public interface IFlwInstanceService { /** * 作废流程 * - * @param bo 参数 + * @param bo 流程实例 * @return 结果 */ boolean processInvalid(FlowInvalidBo bo); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java index 73fffb17c..5d20b05b1 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java @@ -95,6 +95,26 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { return TableDataInfo.build(page); } + /** + * 根据业务id查询流程实例详细信息 + * + * @param businessId 业务id + * @return 结果 + */ + @Override + public FlowInstanceVo queryByBusinessId(Long businessId) { + FlowInstance instance = this.selectInstByBusinessId(String.valueOf(businessId)); + FlowInstanceVo instanceVo = BeanUtil.toBean(instance, FlowInstanceVo.class); + Definition definition = defService.getById(instanceVo.getDefinitionId()); + instanceVo.setFlowName(definition.getFlowName()); + instanceVo.setFlowCode(definition.getFlowCode()); + instanceVo.setVersion(definition.getVersion()); + instanceVo.setFormCustom(definition.getFormCustom()); + instanceVo.setFormPath(definition.getFormPath()); + instanceVo.setCategory(definition.getCategory()); + return instanceVo; + } + /** * 通用查询条件 * diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml index dc6d57ed2..30e2267dc 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml +++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml @@ -25,7 +25,6 @@ fd.flow_name, fd.flow_code, fd.version, - fi.create_by, fd.form_custom, fd.form_path, fd.category