From 527457cf2524d653ac8373d22f9ea94a31e2aac3 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 4 Dec 2025 09:43:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E5=A2=9E=E5=8A=A0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AEID=E5=92=8C=E8=BF=9B=E5=BA=A6=E6=98=8E=E7=BB=86ID?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8F=8A=E7=9B=B8=E5=85=B3=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 OaFileOperationRecord 实体类中新增 projectId 和 trackId 字段 - 在 OaFileOperationRecordBo 业务对象中新增 projectId 和 trackId 字段 - 在 OaFileOperationRecordMapper 中新增 selectVoPagePlus 方法用于分页查询 - 在 OaFileOperationRecordMapper.xml 中配置 selectVoPagePlus 的 SQL 映射 - 新增 buildQueryWrapperPlus 方法支持关联表的条件查询 - 在 OaFileOperationRecordVo 视图对象中新增项目及节点相关字段 - 更新 queryPageList 方法使用新的 --- .../oa/domain/OaFileOperationRecord.java | 6 +++++ .../oa/domain/bo/OaFileOperationRecordBo.java | 5 ++++ .../oa/domain/vo/OaFileOperationRecordVo.java | 12 +++++++++ .../mapper/OaFileOperationRecordMapper.java | 4 +++ .../OaFileOperationRecordServiceImpl.java | 20 ++++++++++++-- .../mapper/oa/OaFileOperationRecordMapper.xml | 27 +++++++++++++++++++ 6 files changed, 72 insertions(+), 2 deletions(-) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaFileOperationRecord.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaFileOperationRecord.java index d384d34..82fcc3c 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaFileOperationRecord.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaFileOperationRecord.java @@ -53,4 +53,10 @@ public class OaFileOperationRecord extends BaseEntity { @TableLogic private Long delFlag; + + //项目id + private Long projectId; + //进度明细id + private Long trackId; + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFileOperationRecordBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFileOperationRecordBo.java index e793ec4..0b8441d 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFileOperationRecordBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFileOperationRecordBo.java @@ -51,5 +51,10 @@ public class OaFileOperationRecordBo extends BaseEntity { */ private String remark; + //项目id + private Long projectId; + //进度明细id + private Long trackId; + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFileOperationRecordVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFileOperationRecordVo.java index 57b2815..8ef38f2 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFileOperationRecordVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFileOperationRecordVo.java @@ -59,4 +59,16 @@ public class OaFileOperationRecordVo { private String remark; + //项目id + private Long projectId; + //进度明细id + private Long trackId; + + private String projectName; + private String tabNode; + private String firstLevelNode; + private String secondLevelNode; + private String nodeHeader; + + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaFileOperationRecordMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaFileOperationRecordMapper.java index acb4b85..8121d6f 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaFileOperationRecordMapper.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaFileOperationRecordMapper.java @@ -1,8 +1,11 @@ package com.ruoyi.oa.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.oa.domain.OaFileOperationRecord; import com.ruoyi.oa.domain.vo.OaFileOperationRecordVo; import com.ruoyi.common.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Param; /** * OA文件操作记录Mapper接口 @@ -12,4 +15,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus; */ public interface OaFileOperationRecordMapper extends BaseMapperPlus { + Page selectVoPagePlus(Page build,@Param("ew") QueryWrapper lqw); } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaFileOperationRecordServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaFileOperationRecordServiceImpl.java index 0764cc3..4316198 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaFileOperationRecordServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaFileOperationRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.oa.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.core.page.TableDataInfo; @@ -45,11 +46,24 @@ public class OaFileOperationRecordServiceImpl implements IOaFileOperationRecordS */ @Override public TableDataInfo queryPageList(OaFileOperationRecordBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + QueryWrapper lqw = buildQueryWrapperPlus(bo); + Page result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw); return TableDataInfo.build(result); } + private QueryWrapper buildQueryWrapperPlus(OaFileOperationRecordBo bo) { + Map params = bo.getParams(); + QueryWrapper qw = Wrappers.query(); + qw.eq(StringUtils.isNotBlank(bo.getFileId()), "ofor.file_id", bo.getFileId()); + qw.eq(bo.getProjectId() != null, "ofor.project_id", bo.getProjectId()); + qw.eq(bo.getTrackId() != null, "ofor.track_id", bo.getTrackId()); + qw.like(StringUtils.isNotBlank(bo.getFileName()), "ofor.file_name", bo.getFileName()); + qw.like(StringUtils.isNotBlank(bo.getOperatorName()), "ofor.operator_name", bo.getOperatorName()); + qw.eq(bo.getType() != null, "ofor.type", bo.getType()); + qw.orderByDesc("ofor.create_time"); + return qw; + } + /** * 查询OA文件操作记录列表 */ @@ -63,6 +77,8 @@ public class OaFileOperationRecordServiceImpl implements IOaFileOperationRecordS Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(StringUtils.isNotBlank(bo.getFileId()), OaFileOperationRecord::getFileId, bo.getFileId()); + lqw.eq(bo.getProjectId() != null, OaFileOperationRecord::getProjectId, bo.getProjectId()); + lqw.eq(bo.getTrackId() != null, OaFileOperationRecord::getTrackId, bo.getTrackId()); lqw.like(StringUtils.isNotBlank(bo.getFileName()), OaFileOperationRecord::getFileName, bo.getFileName()); lqw.like(StringUtils.isNotBlank(bo.getOperatorName()), OaFileOperationRecord::getOperatorName, bo.getOperatorName()); lqw.eq(bo.getType() != null, OaFileOperationRecord::getType, bo.getType()); diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaFileOperationRecordMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaFileOperationRecordMapper.xml index 697648a..d5aa0b1 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/OaFileOperationRecordMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/OaFileOperationRecordMapper.xml @@ -7,6 +7,8 @@ + + @@ -17,6 +19,31 @@ +