From c409a3a58226ab8cd1482cba5d2b63372ac658f8 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Sat, 26 Oct 2024 19:53:09 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/workflow/mapper/FlwDefMapper.java | 26 +++++++++++++++++++
 .../impl/FlwDefinitionServiceImpl.java        | 14 +++++-----
 .../mapper/workflow/FlwDefMapper.xml          | 14 ++++++++++
 3 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwDefMapper.java
 create mode 100644 ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml

diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwDefMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwDefMapper.java
new file mode 100644
index 000000000..b7131184e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwDefMapper.java
@@ -0,0 +1,26 @@
+package org.dromara.workflow.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.warm.flow.orm.entity.FlowDefinition;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 实例信息Mapper接口
+ *
+ * @author may
+ * @date 2024-03-02
+ */
+public interface FlwDefMapper {
+    /**
+     * 流程实例信息
+     *
+     * @param page         分页
+     * @param queryWrapper 条件
+     * @return 结果
+     */
+
+    Page<FlowDefinition> page(@Param("page") Page<FlowDefinition> page,
+                              @Param(Constants.WRAPPER) Wrapper<FlowDefinition> queryWrapper);
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java
index c878a3425..f0604913f 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java
@@ -3,10 +3,11 @@ package org.dromara.workflow.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.warm.flow.core.entity.Definition;
 import com.warm.flow.core.enums.PublishStatus;
 import com.warm.flow.core.service.DefService;
-import com.warm.flow.core.utils.page.Page;
 import com.warm.flow.orm.entity.FlowDefinition;
 import com.warm.flow.orm.mapper.FlowDefinitionMapper;
 import jakarta.servlet.http.HttpServletResponse;
@@ -19,6 +20,7 @@ import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.workflow.domain.vo.FlowDefinitionVo;
+import org.dromara.workflow.mapper.FlwDefMapper;
 import org.dromara.workflow.service.IFlwDefinitionService;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -37,8 +39,8 @@ import java.util.List;
 @Service
 public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
     private final DefService defService;
-
     private final FlowDefinitionMapper flowDefinitionMapper;
+    private final FlwDefMapper flwDefMapper;
 
     /**
      * 分页查询
@@ -48,10 +50,11 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
      */
     @Override
     public TableDataInfo<FlowDefinitionVo> page(FlowDefinition flowDefinition, PageQuery pageQuery) {
-        Page<Definition> page = Page.pageOf(pageQuery.getPageNum(), pageQuery.getPageSize());
-        page = defService.orderByCreateTime().desc().page(flowDefinition, page);
+        QueryWrapper<FlowDefinition> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("create_time");
+        Page<FlowDefinition> page = flwDefMapper.page(pageQuery.build(), queryWrapper);
         TableDataInfo<FlowDefinitionVo> build = TableDataInfo.build();
-        build.setRows(BeanUtil.copyToList(page.getList(), FlowDefinitionVo.class));
+        build.setRows(BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class));
         build.setTotal(page.getTotal());
         return build;
     }
@@ -65,7 +68,6 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
     public List<FlowDefinitionVo> getHisListByKey(String flowCode) {
         LambdaQueryWrapper<FlowDefinition> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(FlowDefinition::getFlowCode, flowCode);
-        wrapper.in(FlowDefinition::getIsPublish, Arrays.asList(PublishStatus.UNPUBLISHED.getKey(), PublishStatus.EXPIRED.getKey()));
         List<FlowDefinition> list = flowDefinitionMapper.selectList(wrapper);
         return BeanUtil.copyToList(list, FlowDefinitionVo.class);
     }
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml
new file mode 100644
index 000000000..ce3912789
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml
@@ -0,0 +1,14 @@
+<?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="org.dromara.workflow.mapper.FlwDefMapper">
+    <select id="page" resultType="com.warm.flow.orm.entity.FlowDefinition">
+        select *
+        from (select a.* from flow_definition a
+        inner join (select flow_code,max(version) version from flow_definition group by flow_code) b
+        on (a.flow_code = b.flow_code and a.version = b.version)) t
+        ${ew.getCustomSqlSegment}
+    </select>
+
+</mapper>