From b1bbbec0672a34bc2ccad1521997f97e80963594 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 6 Sep 2025 16:30:22 +0800
Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E5=A2=9E=E5=8A=A0=E7=AD=BE?=
 =?UTF-8?q?=E7=BA=A6=E5=85=AC=E5=8F=B8=E4=BD=9C=E4=B8=BA=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=9B=88=E4=BA=8F=E5=88=97=E8=A1=A8=E7=9A=84=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 ISysOaProjectService 接口中，增加了 signingCompany 参数
- 在 SysOaProjectController 控制器中，添加了 signingCompany 参数的请求处理
- 在 SysOaProjectServiceImpl 服务实现类中，实现了签约公司作为筛选条件的查询逻辑
---
 .../java/com/ruoyi/oa/controller/SysOaProjectController.java  | 3 ++-
 .../main/java/com/ruoyi/oa/service/ISysOaProjectService.java  | 2 +-
 .../com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java    | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java
index 9073600..a617d3f 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java
@@ -245,6 +245,7 @@ public class SysOaProjectController extends BaseController {
             @RequestParam(required = false) String beginTimeStart,
             @RequestParam(required = false) String beginTimeEnd,
             @RequestParam(required = false) String profitType,
+            @RequestParam(required = false) Integer signingCompany,
             @RequestParam(required = false, defaultValue = "profit_loss") String sortField,
             @RequestParam(required = false, defaultValue = "desc") String sortOrder,
             PageQuery pageQuery
@@ -256,7 +257,7 @@ public class SysOaProjectController extends BaseController {
                 projectName, projectNum, projectCode, tradeType, projectStatus,
                 minContractAmount, maxContractAmount,
                 minProfitLoss, maxProfitLoss,
-                beginTimeStart, beginTimeEnd, profitType, pageQuery);
+                beginTimeStart, beginTimeEnd, profitType,signingCompany, pageQuery);
     }
 
 
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java
index 74139ec..2beeb98 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java
@@ -26,7 +26,7 @@ public interface ISysOaProjectService {
      */
     TableDataInfo<ProjectProfitLossVO> getProjectProfitLossList(String projectName,String projectNum,String projectCode,Integer tradeType,String projectStatus,
                                                                 BigDecimal minContractAmount,BigDecimal maxContractAmount,BigDecimal minProfitLoss,
-                                                                BigDecimal maxProfitLoss,String beginTimeStart,String beginTimeEnd,String profitType,
+                                                                BigDecimal maxProfitLoss,String beginTimeStart,String beginTimeEnd,String profitType,Integer signingCompany,
                                                                 PageQuery pageQuery);
     /**
      * 查询项目管理
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 bf83d66..1edcdc1 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
@@ -72,7 +72,7 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService {
     public TableDataInfo<ProjectProfitLossVO> getProjectProfitLossList(
             String projectName,String projectNum,String projectCode,Integer tradeType,String projectStatus,
             BigDecimal minContractAmount,BigDecimal maxContractAmount,BigDecimal minProfitLoss,
-            BigDecimal maxProfitLoss,String beginTimeStart,String beginTimeEnd,String profitType,
+            BigDecimal maxProfitLoss,String beginTimeStart,String beginTimeEnd,String profitType,Integer signingCompany,
             PageQuery pageQuery
     ) {
         // 1. 获取实时汇率
@@ -89,6 +89,8 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService {
         wrapper.le(maxContractAmount != null, "p.funds", maxContractAmount);
         wrapper.ge(StringUtils.isNotBlank(beginTimeStart), "p.begin_time", beginTimeStart);
         wrapper.le(StringUtils.isNotBlank(beginTimeEnd), "p.begin_time", beginTimeEnd);
+        //把签约公司也作为筛选条件
+        wrapper.like(signingCompany!=null, "p.signing_company", signingCompany);
 
         // 先把 profit_loss 的 CASE 表达式完整地组装成一个字符串
         String profitLossExpr = "(" +