From 10d13946fb80835e6c58cfabb4e462ef93a1a7b7 Mon Sep 17 00:00:00 2001 From: 123 <123@qq.com> Date: Tue, 20 May 2025 18:50:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E7=94=A8=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/mybatis/core/page/PageQuery.java | 3 ++- .../lx/operate/domain/LxMaterialSeal.java | 6 ++--- .../operate/domain/vo/LxMaterialSealVo.java | 8 +++++- .../operate/mapper/LxMaterialSealMapper.java | 5 ++++ .../impl/LxMaterialSealServiceImpl.java | 5 ++-- .../mapper/operate/LxMaterialSealMapper.xml | 25 ++++++++++++++++--- .../mapper/operate/LxTreeTableMapper.xml | 2 +- .../mapper/workflow/LxOaSealMapper.xml | 1 - 8 files changed, 43 insertions(+), 12 deletions(-) diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java index 1d5c3c9da..5bebb9b29 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java @@ -70,12 +70,13 @@ public class PageQuery implements Serializable { if (CollUtil.isNotEmpty(orderItems)) { page.addOrder(orderItems); } + page.setOptimizeCountSql(false); return page; } /** * 构建排序 - * + *

* 支持的用法如下: * {isAsc:"asc",orderByColumn:"id"} order by id asc * {isAsc:"asc",orderByColumn:"id,createTime"} order by id asc,create_time asc diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/LxMaterialSeal.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/LxMaterialSeal.java index 13b508617..e97eae418 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/LxMaterialSeal.java +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/LxMaterialSeal.java @@ -32,7 +32,7 @@ public class LxMaterialSeal extends BaseEntity { /** * 印章类型 */ - private Long sealType; + private Integer sealType; /** * 公章名称 @@ -52,8 +52,8 @@ public class LxMaterialSeal extends BaseEntity { /** * 删除标志 */ - @TableLogic - private Long delFlag; + @TableLogic("del_flag") + private Integer delFlag; } diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/vo/LxMaterialSealVo.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/vo/LxMaterialSealVo.java index 9f7e4a41c..20917d5e3 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/vo/LxMaterialSealVo.java +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/vo/LxMaterialSealVo.java @@ -45,9 +45,15 @@ public class LxMaterialSealVo implements Serializable { /** * 印章管理员 */ - @ExcelProperty(value = "印章管理员") + @ExcelProperty(value = "印章管理员id") private Long sealAdminId; + /** + * 印章管理员姓名 + */ + @ExcelProperty(value = "印章管理员姓名") + private String sealAdminName; + /** * 启用状态 */ diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/mapper/LxMaterialSealMapper.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/mapper/LxMaterialSealMapper.java index 9dc9d0cb6..e42b0ff47 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/mapper/LxMaterialSealMapper.java +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/mapper/LxMaterialSealMapper.java @@ -1,5 +1,9 @@ package org.dromara.lx.operate.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.lx.operate.domain.LxMaterialSeal; import org.dromara.lx.operate.domain.vo.LxMaterialSealVo; @@ -12,4 +16,5 @@ import org.dromara.lx.operate.domain.vo.LxMaterialSealVo; */ public interface LxMaterialSealMapper extends BaseMapperPlus { + Page querySealVoPage(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); } diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/service/impl/LxMaterialSealServiceImpl.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/service/impl/LxMaterialSealServiceImpl.java index 5991ca351..2fece194b 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/service/impl/LxMaterialSealServiceImpl.java +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/service/impl/LxMaterialSealServiceImpl.java @@ -52,8 +52,8 @@ public class LxMaterialSealServiceImpl implements ILxMaterialSealService { @Override public TableDataInfo queryPageList(LxMaterialSealBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); + Page page = baseMapper.querySealVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(page); } /** @@ -89,6 +89,7 @@ public class LxMaterialSealServiceImpl implements ILxMaterialSealService { public Boolean insertByBo(LxMaterialSealBo bo) { LxMaterialSeal add = MapstructUtils.convert(bo, LxMaterialSeal.class); validEntityBeforeSave(add); + add.setDelFlag(0); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); diff --git a/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/operate/LxMaterialSealMapper.xml b/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/operate/LxMaterialSealMapper.xml index 7c0473cf8..3c237d1a6 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/operate/LxMaterialSealMapper.xml +++ b/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/operate/LxMaterialSealMapper.xml @@ -1,7 +1,26 @@ - + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + diff --git a/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/operate/LxTreeTableMapper.xml b/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/operate/LxTreeTableMapper.xml index d4cef169b..81c4355bf 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/operate/LxTreeTableMapper.xml +++ b/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/operate/LxTreeTableMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/LxOaSealMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/LxOaSealMapper.xml index 2ba67ae99..3e58c1bd9 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/LxOaSealMapper.xml +++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/LxOaSealMapper.xml @@ -46,7 +46,6 @@ oa.take_out_end_date, oa.file_count, oa.initiator_type, - m_seal.id, m_seal.seal_type, m_seal.seal_name from lx_oa_seal oa