From 226eee0b7ca6b9889e5bf7a42a1c2aeb90182deb Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 6 Sep 2025 15:53:23 +0800
Subject: [PATCH] =?UTF-8?q?refactor(oa):=20=E5=B0=86=E7=AD=BE=E7=BA=A6?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=BB=8E?=
 =?UTF-8?q?=20String=20=E6=94=B9=E4=B8=BA=20Integer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 SysOaProject、SysOaProjectBo、SysOaProjectVo 中将 signingCompany 字段类型从 String 改为 Integer
- 更新 SysOaProjectServiceImpl 中的相关查询条件
-此修改可能会影响前端界面展示，需同步更新前端相关代码
---
 ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java   | 2 +-
 .../src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java   | 3 ++-
 .../src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java   | 2 +-
 .../com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java     | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java
index e9dff74..9aa8b3e 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java
@@ -154,5 +154,5 @@ public class SysOaProject extends BaseEntity {
      */
     private String projectCode;
     //签约公司
-    private String signingCompany;
+    private Integer signingCompany;
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java
index d842afa..25bd5e7 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java
@@ -3,6 +3,7 @@ package com.ruoyi.oa.domain.bo;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
+import liquibase.pro.packaged.I;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
@@ -189,6 +190,6 @@ public class SysOaProjectBo extends BaseEntity {
 
     private String status;
     //签约公司
-    private String signingCompany;
+    private Integer signingCompany;
 }
 
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java
index 9225960..4b2f14f 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java
@@ -256,6 +256,6 @@ public class SysOaProjectVo {
      */
     private String status;
     //签约公司
-    private String signingCompany;
+    private Integer signingCompany;
 
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java
index a7fe8e7..bf83d66 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java
@@ -181,7 +181,7 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService {
         lqw.eq(StringUtils.isNotBlank(bo.getProjectStatus()), SysOaProject::getProjectStatus, bo.getProjectStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), SysOaProject::getCreateBy, bo.getCreateBy());
         //新增签约公司作为筛选条件
-        lqw.eq(StringUtils.isNotBlank(bo.getSigningCompany()), SysOaProject::getSigningCompany, bo.getSigningCompany());
+        lqw.eq(bo.getSigningCompany()!= null, SysOaProject::getSigningCompany, bo.getSigningCompany());
         lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
                 SysOaProject::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
         lqw.orderByDesc(SysOaProject::getCreateTime);