abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化流程定义列表名称

Browse Source
This commit is contained in:
AprilWind 2024-12-16 14:44:16 +08:00
parent eba12bf236
commit 568ba3dcfe
5 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java
View File

@ -36,17 +36,17 @@ import java.util.List;
public class FlwDefinitionController extends BaseController {
private final IFlwCategoryService flwCategoryService;
private final IFlwDefinitionService iFlwDefinitionService;
private final IFlwDefinitionService flwDefinitionService;
private final DefService defService;
/**
* 分页查询
* 查询流程定义列表
*
* @param flowDefinition 参数
*/
@GetMapping("/list")
public TableDataInfo<FlowDefinitionVo> page(FlowDefinition flowDefinition, PageQuery pageQuery) {
return iFlwDefinitionService.page(flowDefinition, pageQuery);
public TableDataInfo<FlowDefinitionVo> list(FlowDefinition flowDefinition, PageQuery pageQuery) {
return flwDefinitionService.queryList(flowDefinition, pageQuery);
}
/**
@ -64,7 +64,7 @@ public class FlwDefinitionController extends BaseController {
*/
@GetMapping("/getHisListByKey/{flowCode}")
public R<List<FlowDefinitionVo>> getHisListByKey(@PathVariable String flowCode) {
return R.ok(iFlwDefinitionService.getHisListByKey(flowCode));
return R.ok(flwDefinitionService.getHisListByKey(flowCode));
}
/**
@ -132,7 +132,7 @@ public class FlwDefinitionController extends BaseController {
@DeleteMapping("/{ids}")
@Transactional(rollbackFor = Exception.class)
public R<Void> remove(@PathVariable List<Long> ids) {
return toAjax(iFlwDefinitionService.removeDef(ids));
return toAjax(flwDefinitionService.removeDef(ids));
}
/**
@ -156,7 +156,7 @@ public class FlwDefinitionController extends BaseController {
@PostMapping("/importDef")
@Transactional(rollbackFor = Exception.class)
public R<Boolean> importDef(MultipartFile file, String category) {
return R.ok(iFlwDefinitionService.importXml(file, category));
return R.ok(flwDefinitionService.importXml(file, category));
}
/**
@ -169,7 +169,7 @@ public class FlwDefinitionController extends BaseController {
@Log(title = "流程定义", businessType = BusinessType.EXPORT)
@PostMapping("/exportDef/{id}")
public void exportDef(@PathVariable Long id, HttpServletResponse response) throws IOException {
iFlwDefinitionService.exportDef(id, response);
flwDefinitionService.exportDef(id, response);
}
/**

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwDefMapper.java
View File

@ -21,6 +21,6 @@ public interface FlwDefMapper {
* @param queryWrapper 条件
* @return 结果
*/
Page<FlowDefinition> page(@Param("page") Page<FlowDefinition> page, @Param(Constants.WRAPPER) Wrapper<FlowDefinition> queryWrapper);
Page<FlowDefinition> selectDefinitionList(@Param("page") Page<FlowDefinition> page, @Param(Constants.WRAPPER) Wrapper<FlowDefinition> queryWrapper);
}

5
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java
View File

@ -16,14 +16,15 @@ import java.util.List;
* @author may
*/
public interface IFlwDefinitionService {
/**
* 分页查询
* 查询流程定义列表
*
* @param flowDefinition 参数
* @param pageQuery 分页
* @return 返回分页列表
*/
TableDataInfo<FlowDefinitionVo> page(FlowDefinition flowDefinition, PageQuery pageQuery);
TableDataInfo<FlowDefinitionVo> queryList(FlowDefinition flowDefinition, PageQuery pageQuery);
/**
* 获取历史流程定义列表

8
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java
View File

@ -53,19 +53,19 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
private final FlowHisTaskMapper flowHisTaskMapper;
/**
* 分页查询
* 查询流程定义列表
*
* @param flowDefinition 参数
* @param flowDefinition 流程定义信息
* @return 返回分页列表
*/
@Override
public TableDataInfo<FlowDefinitionVo> page(FlowDefinition flowDefinition, PageQuery pageQuery) {
public TableDataInfo<FlowDefinitionVo> queryList(FlowDefinition flowDefinition, PageQuery pageQuery) {
QueryWrapper<FlowDefinition> queryWrapper = new QueryWrapper<>();
queryWrapper.like(StringUtils.isNotBlank(flowDefinition.getFlowCode()), "flow_code", flowDefinition.getFlowCode());
queryWrapper.like(StringUtils.isNotBlank(flowDefinition.getFlowName()), "flow_Name", flowDefinition.getFlowName());
queryWrapper.eq(StringUtils.isNotBlank(flowDefinition.getCategory()), "category", flowDefinition.getCategory());
queryWrapper.orderByDesc("create_time");
Page<FlowDefinition> page = flwDefMapper.page(pageQuery.build(), queryWrapper);
Page<FlowDefinition> page = flwDefMapper.selectDefinitionList(pageQuery.build(), queryWrapper);
TableDataInfo<FlowDefinitionVo> build = TableDataInfo.build();
build.setRows(BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class));
build.setTotal(page.getTotal());

3
ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml
View File

@ -3,7 +3,8 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.workflow.mapper.FlwDefMapper">
<select id="page" resultType="org.dromara.warm.flow.orm.entity.FlowDefinition">
<select id="selectDefinitionList" resultType="org.dromara.warm.flow.orm.entity.FlowDefinition">
select *
from (
select a.*