From 2d7639f6704195aa56f3c8027bcc32b699820056 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 28 Jun 2025 09:57:48 +0800
Subject: [PATCH] =?UTF-8?q?requirement=E8=A1=A8=E7=9A=84=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/oa/mapper/OaRequirementsMapper.java |  7 +++++
 .../impl/OaRequirementsServiceImpl.java       | 31 ++++++++++---------
 .../mapper/oa/OaRequirementsMapper.xml        | 19 ++++++++----
 3 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaRequirementsMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaRequirementsMapper.java
index 16e5559..3515eed 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaRequirementsMapper.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaRequirementsMapper.java
@@ -6,6 +6,8 @@ import com.ruoyi.oa.domain.vo.OaRequirementsVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * OA 需求Mapper接口
  *
@@ -14,4 +16,9 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface OaRequirementsMapper extends BaseMapperPlus<OaRequirementsMapper, OaRequirements, OaRequirementsVo> {
     Page<OaRequirementsVo> selectVoListPage(Page<?> page, @Param("ew") Object lqw);
+    
+    /**
+     * 查询需求列表（用于导出）
+     */
+    List<OaRequirementsVo> selectVoListForExport(@Param("ew") Object lqw);
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaRequirementsServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaRequirementsServiceImpl.java
index 208e832..c5a5b87 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaRequirementsServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaRequirementsServiceImpl.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.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
@@ -44,7 +45,7 @@ public class OaRequirementsServiceImpl implements IOaRequirementsService {
      */
     @Override
     public TableDataInfo<OaRequirementsVo> queryPageList(OaRequirementsBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<OaRequirements> lqw = buildQueryWrapper(bo);
+        QueryWrapper<OaRequirements> lqw = buildQueryWrapper(bo);
         Page<OaRequirementsVo> result = baseMapper.selectVoListPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
@@ -54,22 +55,22 @@ public class OaRequirementsServiceImpl implements IOaRequirementsService {
      */
     @Override
     public List<OaRequirementsVo> queryList(OaRequirementsBo bo) {
-        LambdaQueryWrapper<OaRequirements> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        QueryWrapper<OaRequirements> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoListForExport(lqw);
     }
 
-    private LambdaQueryWrapper<OaRequirements> buildQueryWrapper(OaRequirementsBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<OaRequirements> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), OaRequirements::getTitle, bo.getTitle());
-        lqw.eq(bo.getRequesterId() != null, OaRequirements::getRequesterId, bo.getRequesterId());
-        lqw.eq(bo.getOwnerId() != null, OaRequirements::getOwnerId, bo.getOwnerId());
-        lqw.eq(bo.getProjectId() != null, OaRequirements::getProjectId, bo.getProjectId());
-        lqw.eq(StringUtils.isNotBlank(bo.getDescription()), OaRequirements::getDescription, bo.getDescription());
-        lqw.eq(bo.getDeadline() != null, OaRequirements::getDeadline, bo.getDeadline());
-        lqw.eq(bo.getStatus() != null, OaRequirements::getStatus, bo.getStatus());
-        lqw.eq(StringUtils.isNotBlank(bo.getAccessory()), OaRequirements::getAccessory, bo.getAccessory());
-        return lqw;
+    private QueryWrapper<OaRequirements> buildQueryWrapper(OaRequirementsBo bo) {
+        QueryWrapper<OaRequirements> qw = new QueryWrapper<>();
+        qw.eq(StringUtils.isNotBlank(bo.getTitle()), "r.title", bo.getTitle());
+        qw.eq(bo.getRequesterId() != null, "r.requester_id", bo.getRequesterId());
+        qw.eq(bo.getOwnerId() != null, "r.owner_id", bo.getOwnerId());
+        qw.eq(bo.getProjectId() != null, "r.project_id", bo.getProjectId());
+        qw.eq(StringUtils.isNotBlank(bo.getDescription()), "r.description", bo.getDescription());
+        qw.eq(bo.getDeadline() != null, "r.deadline", bo.getDeadline());
+        qw.eq(bo.getStatus() != null, "r.status", bo.getStatus());
+        qw.eq(StringUtils.isNotBlank(bo.getAccessory()), "r.accessory", bo.getAccessory());
+        qw.eq("r.del_flag", 0);
+        return qw;
     }
 
     /**
diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaRequirementsMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaRequirementsMapper.xml
index 9a8b89f..bddae66 100644
--- a/ruoyi-oa/src/main/resources/mapper/oa/OaRequirementsMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/OaRequirementsMapper.xml
@@ -32,13 +32,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN sys_user u1 ON r.requester_id = u1.user_id
         LEFT JOIN sys_user u2 ON r.owner_id = u2.user_id
         LEFT JOIN sys_oa_project p ON r.project_id = p.project_id
-        <where>
-            r.del_flag = 0
-            <if test="ew != null and ew.sqlSegment != null">
-                ${ew.customSqlSegment}
-            </if>
-        </where>
+        ${ew.customSqlSegment}
     </select>
 
+    <select id="selectVoListForExport" resultType="com.ruoyi.oa.domain.vo.OaRequirementsVo">
+        SELECT
+        r.*,
+        u1.nick_name AS requester_nick_name,
+        u2.nick_name AS owner_nick_name,
+        p.project_name
+        FROM oa_requirements r
+        LEFT JOIN sys_user u1 ON r.requester_id = u1.user_id
+        LEFT JOIN sys_user u2 ON r.owner_id = u2.user_id
+        LEFT JOIN sys_oa_project p ON r.project_id = p.project_id
+        ${ew.customSqlSegment}
+    </select>
 
 </mapper>