From 7027a58143da7011d54c211c1cfedec911ba5e73 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 9 Aug 2025 18:08:04 +0800
Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E4=BB=BB=E5=8A=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 SysOaTaskBo 和 SysOaTaskVo 中添加 projectCode 字段
- 在 SysOaTaskMapper.xml 中添加 project_code 列的查询
- 在 SysOaTaskServiceImpl 中添加 projectCode 的模糊查询条件
---
 ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java | 2 ++
 ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskVo.java | 3 +++
 .../java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java   | 3 +++
 ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml      | 1 +
 4 files changed, 9 insertions(+)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java
index c1ecfa4..8bb1f04 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java
@@ -184,4 +184,6 @@ public class SysOaTaskBo extends BaseEntity {
     private Long itemStatus;
 
     private String files;
+    //project_code
+    private String projectCode;
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskVo.java
index 919627b..5e82bb5 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskVo.java
@@ -211,4 +211,7 @@ public class SysOaTaskVo {
     private List<SysOaTaskItemVo> taskItemVoList;
 
     private String files;
+
+    //project_code
+    private String projectCode;
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java
index 7f9d376..cc62507 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java
@@ -12,6 +12,7 @@ import com.ruoyi.oa.domain.bo.SysOaTaskItemBo;
 import com.ruoyi.oa.mapper.SysOaTaskItemMapper;
 import com.ruoyi.oa.service.ISysOaTaskItemService;
 import com.ruoyi.system.service.ISysOssService;
+import jodd.util.StringUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -151,6 +152,8 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
         lqw.like(bo.getTaskTitle()!=null, "sot.task_title", bo.getTaskTitle());
         lqw.like(bo.getCreateUserNickName()!=null, "su1.nick_name", bo.getCreateUserNickName());
         lqw.like(bo.getWorkerNickName()!=null, "su2.nick_name", bo.getWorkerNickName());
+        // 添加projectCode的模糊查询判断
+        lqw.like(bo.getProjectCode() != null, "sop.project_code", bo.getProjectCode());
         return lqw;
     }
 
diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml
index 93cd403..572af9d 100644
--- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml
@@ -79,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                sot.own_rank,
                sop.project_name,
                sop.project_num,
+               sop.project_code,
                su1.nick_name                        AS createUserNickName,
                su2.nick_name                        AS workerNickName,
                IF(