From a1615a1ae9197b0004dd99094f3b440da618ef1e Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Thu, 18 Jul 2024 16:13:39 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=B5=81=E7=A8=8B=E5=AE=9E?= =?UTF-8?q?=E4=BE=8B=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mapper/ActRuExecutionMapper.java | 6 +++++ .../dao/mapper/xml/ActRuExecutionMapper.xml | 18 ++++++++++++++ .../impl/ActRuExecutionServiceImpl.java | 24 +++++++++++-------- .../wms/flow_manage/act/execution/index.vue | 17 +++++++------ 4 files changed, 48 insertions(+), 17 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/ActRuExecutionMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/ActRuExecutionMapper.java index 12a88dcf..7c0d7f32 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/ActRuExecutionMapper.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/ActRuExecutionMapper.java @@ -1,10 +1,14 @@ package org.nl.wms.flow_manage.flow.service.execution.dao.mapper; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.nl.common.domain.entity.PageQuery; import org.nl.wms.flow_manage.flow.service.execution.dao.ActRuExecution; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.flow_manage.flow.service.execution.dto.ExecutionQuery; import java.util.List; +import java.util.Map; /** *

@@ -38,4 +42,6 @@ public interface ActRuExecutionMapper extends BaseMapper { "\t@r <> 0 \n" + "\tAND parent_id > 0 ) as d") String findParent(String proc_inst_id); + + List pageGetAll(@Param("query") ExecutionQuery query, @Param("pageQuery") PageQuery pageQuery); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/xml/ActRuExecutionMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/xml/ActRuExecutionMapper.xml index db000f2f..4f7df4a2 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/xml/ActRuExecutionMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/xml/ActRuExecutionMapper.xml @@ -2,4 +2,22 @@ + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java index b9d5f664..5139384e 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java @@ -4,10 +4,13 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; 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.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.StringUtils; import org.nl.common.TableDataInfo; import org.nl.common.domain.entity.PageQuery; @@ -27,6 +30,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Map; /** *

@@ -43,16 +47,16 @@ public class ActRuExecutionServiceImpl extends ServiceImpl build = (QueryWrapper) query.build(); - build.isNull("parent_id"); - Page executionPage = this.page(page.build(), build); -// List records = executionPage.getRecords(); -// this.findChildren(records); - return TableDataInfo.build(executionPage); + public Object getAll(ExecutionQuery query, PageQuery pageQuery) { + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + List list = actRuExecutionMapper.pageGetAll(query, pageQuery); + TableDataInfo build = TableDataInfo.build(list); + build.setTotalElements(page.getTotal()); + return build; } @Override @@ -100,7 +104,7 @@ public class ActRuExecutionServiceImpl extends ServiceImpl getChildList(String proc_inst_id) { Assert.notNull(proc_inst_id, "参数不能为空"); String allChild = this.baseMapper.findAllChild(proc_inst_id); - if (StringUtils.isNotEmpty(allChild)){ + if (StringUtils.isNotEmpty(allChild)) { return Arrays.asList(allChild.split(",")); } return new ArrayList<>(); diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue b/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue index ab292cee..358992cc 100644 --- a/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue +++ b/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue @@ -94,14 +94,17 @@ + + + - + + + + + + +