xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-11-17 06:33:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add 添加按照业务id删除流程记录

Browse Source
This commit is contained in:
gssong
2023-07-23 11:36:17 +08:00
parent b3f40fddb2
commit 670b04faf0
7 changed files with 72 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestLeaveController.java
View File

@@ -101,6 +101,6 @@ public class TestLeaveController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(testLeaveService.deleteWithValidByIds(List.of(ids), true));
return toAjax(testLeaveService.deleteWithValidByIds(List.of(ids)));
}
}

1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestLeaveBo.java
View File

@@ -41,7 +41,6 @@ public class TestLeaveBo extends BaseEntity {
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
private String remark;

2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestLeaveService.java
View File

@@ -45,5 +45,5 @@ public interface ITestLeaveService {
/**
* 校验并批量删除请假信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
Boolean deleteWithValidByIds(Collection<Long> ids);
}

13
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestLeaveServiceImpl.java
View File

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.workflow.service.IActProcessInstanceService;
import org.dromara.workflow.utils.WorkflowUtils;
import org.springframework.stereotype.Service;
import org.dromara.demo.domain.bo.TestLeaveBo;
@@ -33,6 +34,7 @@ import java.util.Collection;
public class TestLeaveServiceImpl implements ITestLeaveService {
private final TestLeaveMapper baseMapper;
private final IActProcessInstanceService iActProcessInstanceService;
/**
* 查询请假
@@ -51,9 +53,9 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
Page<TestLeaveVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
TableDataInfo<TestLeaveVo> build = TableDataInfo.build(result);
List<TestLeaveVo> rows = build.getRows();
if(CollUtil.isNotEmpty(rows)){
if (CollUtil.isNotEmpty(rows)) {
List<String> ids = StreamUtils.toList(rows, e -> String.valueOf(e.getId()));
WorkflowUtils.setProcessInstanceListVo(rows,ids,"id");
WorkflowUtils.setProcessInstanceListVo(rows, ids, "id");
}
return build;
}
@@ -110,10 +112,9 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
* 批量删除请假
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
public Boolean deleteWithValidByIds(Collection<Long> ids) {
List<String> idList = StreamUtils.toList(ids, String::valueOf);
iActProcessInstanceService.deleteRuntimeProcessAndHisInstByBusinessKeys(idList);
return baseMapper.deleteBatchIds(ids) > 0;
}
}