From ed8202891f39e1614cd4a71b399b875e610a0a92 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期四, 21 三月 2024 21:48:44 +0800
Subject: [PATCH] update 调整请假申请返回值，我的发起查询
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java | 4 ++--
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java | 4 ++--
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java | 6 ++++++
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java | 28 ++++++++++++----------------
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java | 5 +++++
5 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java
index cc83c28..16d92ff 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java
@@ -77,7 +77,7 @@
@Log(title = "璇峰亣", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
- public R<TestLeave> add(@Validated(AddGroup.class) @RequestBody TestLeaveBo bo) {
+ public R<TestLeaveVo> add(@Validated(AddGroup.class) @RequestBody TestLeaveBo bo) {
return R.ok(testLeaveService.insertByBo(bo));
}
@@ -88,7 +88,7 @@
@Log(title = "璇峰亣", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
- public R<TestLeave> edit(@Validated(EditGroup.class) @RequestBody TestLeaveBo bo) {
+ public R<TestLeaveVo> edit(@Validated(EditGroup.class) @RequestBody TestLeaveBo bo) {
return R.ok(testLeaveService.updateByBo(bo));
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java
index 3917f4f..73e1e6d 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java
@@ -92,4 +92,9 @@
* 寰呭姙浠诲姟闆嗗悎
*/
private List<TaskVo> taskVoList;
+
+ /**
+ * 琛ㄥ崟閰嶇疆
+ */
+ private WfFormDefinitionVo wfFormDefinitionVo;
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java
index 606b255..5c95547 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java
@@ -35,12 +35,12 @@
/**
* 鏂板璇峰亣
*/
- TestLeave insertByBo(TestLeaveBo bo);
+ TestLeaveVo insertByBo(TestLeaveBo bo);
/**
* 淇敼璇峰亣
*/
- TestLeave updateByBo(TestLeaveBo bo);
+ TestLeaveVo updateByBo(TestLeaveBo bo);
/**
* 鏍￠獙骞舵壒閲忓垹闄よ鍋囦俊鎭�
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
index b348216..1a3b8b7 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
@@ -61,6 +61,8 @@
import java.util.*;
import java.util.stream.Collectors;
+import static org.dromara.workflow.common.constant.FlowConstant.PROCESS_DEFINITION_ID;
+
/**
* 娴佺▼瀹炰緥 鏈嶅姟灞傚疄鐜�
*
@@ -654,6 +656,10 @@
}
list.add(processInstanceVo);
}
+ if (CollUtil.isNotEmpty(list)) {
+ List<String> processDefinitionIds = StreamUtils.toList(list, ProcessInstanceVo::getProcessDefinitionId);
+ WorkflowUtils.setWfFormDefinitionVo(list, processDefinitionIds, PROCESS_DEFINITION_ID);
+ }
long count = query.count();
return new TableDataInfo<>(list, count);
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
index 276cafe..8d00869 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
@@ -43,7 +43,7 @@
@Override
public TestLeaveVo queryById(Long id) {
TestLeaveVo testLeaveVo = baseMapper.selectVoById(id);
- WorkflowUtils.setProcessInstanceVo(testLeaveVo,String.valueOf(id));
+ WorkflowUtils.setProcessInstanceVo(testLeaveVo, String.valueOf(id));
return testLeaveVo;
}
@@ -75,8 +75,8 @@
private LambdaQueryWrapper<TestLeave> buildQueryWrapper(TestLeaveBo bo) {
LambdaQueryWrapper<TestLeave> lqw = Wrappers.lambdaQuery();
lqw.eq(StringUtils.isNotBlank(bo.getLeaveType()), TestLeave::getLeaveType, bo.getLeaveType());
- lqw.ge(bo.getStartLeaveDays() != null,TestLeave::getLeaveDays, bo.getStartLeaveDays());
- lqw.le(bo.getEndLeaveDays() != null,TestLeave::getLeaveDays, bo.getEndLeaveDays());
+ lqw.ge(bo.getStartLeaveDays() != null, TestLeave::getLeaveDays, bo.getStartLeaveDays());
+ lqw.le(bo.getEndLeaveDays() != null, TestLeave::getLeaveDays, bo.getEndLeaveDays());
lqw.orderByDesc(BaseEntity::getCreateTime);
return lqw;
}
@@ -85,31 +85,27 @@
* 鏂板璇峰亣
*/
@Override
- public TestLeave insertByBo(TestLeaveBo bo) {
+ public TestLeaveVo insertByBo(TestLeaveBo bo) {
TestLeave add = MapstructUtils.convert(bo, TestLeave.class);
- validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
- return add;
+ TestLeaveVo testLeaveVo = MapstructUtils.convert(add, TestLeaveVo.class);
+ WorkflowUtils.setProcessInstanceVo(testLeaveVo, String.valueOf(add.getId()));
+ return testLeaveVo;
}
/**
* 淇敼璇峰亣
*/
@Override
- public TestLeave updateByBo(TestLeaveBo bo) {
+ public TestLeaveVo updateByBo(TestLeaveBo bo) {
TestLeave update = MapstructUtils.convert(bo, TestLeave.class);
- validEntityBeforeSave(update);
- return baseMapper.updateById(update) > 0 ? update : null;
- }
-
- /**
- * 淇濆瓨鍓嶇殑鏁版嵁鏍￠獙
- */
- private void validEntityBeforeSave(TestLeave entity) {
- //TODO 鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
+ baseMapper.updateById(update);
+ TestLeaveVo testLeaveVo = MapstructUtils.convert(update, TestLeaveVo.class);
+ WorkflowUtils.setProcessInstanceVo(testLeaveVo, String.valueOf(update.getId()));
+ return testLeaveVo;
}
/**
--
Gitblit v1.9.3