流程配置

hx-flow/src/main/java/com/fjhx/flow/controller/flow/FlowDefinitionController.java

@@ -1,8 +1,11 @@
 package com.fjhx.flow.controller.flow;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.flow.entity.flow.dto.FlowDefinitionDto;
+import com.fjhx.flow.entity.flow.dto.FlowDefinitionSelectDto;
 import com.fjhx.flow.entity.flow.po.FlowDefinition;
+import com.fjhx.flow.entity.flow.vo.FlowDefinitionPageVo;
 import com.fjhx.flow.service.flow.FlowDefinitionService;
 import com.ruoyi.common.annotation.TenantIgnore;
 import com.ruoyi.common.constant.BaseSourceConstant;
@@ -32,6 +35,14 @@ public class FlowDefinitionController {
     private FlowDefinitionService flowDefinitionService;
 
     /**
+     * 租户流程分页
+     */
+    @PostMapping("/page")
+    public Page<FlowDefinitionPageVo> page(@RequestBody FlowDefinitionSelectDto dto) {
+        return flowDefinitionService.getPage(dto);
+    }
+
+    /**
      * 添加租户流程
      */
     @PostMapping("/add")

hx-flow/src/main/java/com/fjhx/flow/entity/flow/dto/FlowDefinitionSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.flow.entity.flow.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 流程定义列表查询入参实体
+ *
+ * @author 
+ * @since 2023-04-03
+ */
+@Getter
+@Setter
+public class FlowDefinitionSelectDto extends BaseSelectDto {
+
+}

hx-flow/src/main/java/com/fjhx/flow/entity/flow/vo/FlowDefinitionPageVo.java

@@ -0,0 +1,41 @@
+package com.fjhx.flow.entity.flow.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 流程定义列表查询返回值实体
+ *
+ * @author
+ * @since 2023-04-03
+ */
+@Getter
+@Setter
+public class FlowDefinitionPageVo {
+
+    /**
+     * 流程定义id
+     */
+    private Long id;
+
+    /**
+     * 分类名称
+     */
+    private String classifyName;
+
+    /**
+     * 流程名称
+     */
+    private String flowName;
+
+    /**
+     * 流程标识
+     */
+    private String flowKey;
+
+    /**
+     * 版本号
+     */
+    private Integer versionNumber;
+
+}

hx-flow/src/main/java/com/fjhx/flow/mapper/flow/FlowDefinitionMapper.java

@@ -1,7 +1,11 @@
 package com.fjhx.flow.mapper.flow;
 
-import com.fjhx.flow.entity.flow.po.FlowDefinition;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.flow.entity.flow.po.FlowDefinition;
+import com.fjhx.flow.entity.flow.vo.FlowDefinitionPageVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
@@ -9,9 +13,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 流程定义 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-03-15
  */
 public interface FlowDefinitionMapper extends BaseMapper<FlowDefinition> {
 
+    /**
+     * 租户流程分页
+     */
+    Page<FlowDefinitionPageVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Object> wrapper);
+
 }

hx-flow/src/main/java/com/fjhx/flow/service/flow/FlowDefinitionService.java

@@ -1,7 +1,10 @@
 package com.fjhx.flow.service.flow;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.flow.entity.flow.dto.FlowDefinitionDto;
+import com.fjhx.flow.entity.flow.dto.FlowDefinitionSelectDto;
 import com.fjhx.flow.entity.flow.po.FlowDefinition;
+import com.fjhx.flow.entity.flow.vo.FlowDefinitionPageVo;
 import com.ruoyi.common.core.service.BaseService;
 
 
@@ -16,6 +19,11 @@ import com.ruoyi.common.core.service.BaseService;
 public interface FlowDefinitionService extends BaseService<FlowDefinition> {
 
     /**
+     * 租户流程分页
+     */
+    Page<FlowDefinitionPageVo> getPage(FlowDefinitionSelectDto dto);
+
+    /**
      * 添加租户流程
      */
     void add(FlowDefinition flowDefinition);

hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowDefinitionServiceImpl.java

@@ -2,11 +2,14 @@ package com.fjhx.flow.service.flow.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.flow.entity.flow.dto.FlowDefinitionDto;
+import com.fjhx.flow.entity.flow.dto.FlowDefinitionSelectDto;
 import com.fjhx.flow.entity.flow.po.FlowDefinition;
 import com.fjhx.flow.entity.flow.po.FlowDefinitionNode;
 import com.fjhx.flow.entity.flow.po.FlowInfo;
+import com.fjhx.flow.entity.flow.vo.FlowDefinitionPageVo;
 import com.fjhx.flow.enums.NodeTypeEnum;
 import com.fjhx.flow.mapper.flow.FlowDefinitionMapper;
 import com.fjhx.flow.service.flow.FlowDefinitionNodeService;
@@ -15,6 +18,8 @@ import com.fjhx.flow.service.flow.FlowInfoService;
 import com.ruoyi.common.constant.StatusConstant;
 import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,6 +45,14 @@ public class FlowDefinitionServiceImpl extends ServiceImpl<FlowDefinitionMapper,
     @Autowired
     private FlowDefinitionNodeService flowDefinitionNodeService;
 
+    @Override
+    public Page<FlowDefinitionPageVo> getPage(FlowDefinitionSelectDto dto) {
+        IWrapper<Object> wrapper = IWrapper.getWrapper()
+                .keyword(dto, new SqlField("fi", FlowInfo::getFlowKey), new SqlField("fi", FlowInfo::getFlowName))
+                .eq("fd", FlowDefinition::getCurrentVersion, StatusConstant.YES);
+        return baseMapper.getPage(dto.getPage(), wrapper);
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(FlowDefinition flowDefinition) {

hx-flow/src/main/resources/mapper/flow/FlowDefinitionMapper.xml

@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.flow.mapper.flow.FlowDefinitionMapper">
+
+    <select id="getPage" resultType="com.fjhx.flow.entity.flow.vo.FlowDefinitionPageVo">
+        select fd.id,
+               fi.classify_name,
+               fi.flow_name,
+               fi.flow_key,
+               fd.version_number
+        from flow_definition fd
+                 left join flow_info fi on fd.flow_info_id = fi.id
+            ${ew.customSqlSegment}
+    </select>
+
 </mapper>