From 17bf0c06236c2956ad9b6fe2b89524de7a0c608c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 27 四月 2024 16:15:14 +0800
Subject: [PATCH] update 优化 代码生成表导入 排除工作流相关表
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
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 7b55ee5..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
@@ -23,7 +23,6 @@
import java.util.Collection;
import java.util.List;
-import java.util.Map;
/**
* 璇峰亣Service涓氬姟灞傚鐞�
@@ -43,7 +42,9 @@
*/
@Override
public TestLeaveVo queryById(Long id) {
- return baseMapper.selectVoById(id);
+ TestLeaveVo testLeaveVo = baseMapper.selectVoById(id);
+ WorkflowUtils.setProcessInstanceVo(testLeaveVo, String.valueOf(id));
+ return testLeaveVo;
}
/**
@@ -74,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;
}
@@ -84,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;
}
/**
@@ -118,7 +115,7 @@
@Transactional(rollbackFor = Exception.class)
public Boolean deleteWithValidByIds(Collection<Long> ids) {
List<String> idList = StreamUtils.toList(ids, String::valueOf);
- iActProcessInstanceService.deleteRuntimeProcessAndHisInstByBusinessKeys(idList);
+ iActProcessInstanceService.deleteRunAndHisInstanceByBusinessKeys(idList);
return baseMapper.deleteBatchIds(ids) > 0;
}
}
--
Gitblit v1.9.3