From d38710c9358915f90cd1cb249b3fdb441c104cde Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 17 May 2023 13:50:00 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE-=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E5=8D=95=E4=BD=8D=E7=9A=84=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/project/controller/PayWorkingGroupController.java   | 5 +++--
 .../java/com/jero/project/mapper/PayWorkingGroupMapper.java  | 2 +-
 .../com/jero/project/mapper/xml/PayWorkingGroupMapper.xml    | 3 +++
 .../com/jero/project/service/IPayWorkingGroupService.java    | 3 +--
 .../project/service/impl/PayWorkingGroupServiceImpl.java     | 4 ++--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
index ec589851..ede3e42b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
@@ -184,11 +184,12 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	  */
 	 @ApiOperation(value="工作组项目-查询不存在成员单位的列表", notes="工作组项目-查询不存在成员单位的列表")
 	 @GetMapping(value = "/queryListByNotCompany")
-	 public Result<?> queryListByNotCompany(@RequestParam(name = "companyId") String companyId) {
+	 public Result<?> queryListByNotCompany(@RequestParam(name = "companyId") String companyId,
+											@RequestParam(name = "workingGroupProject", required = false) String workingGroupProject) {
 		 if(StringUtils.isBlank(companyId)){
 			 return Result.error("企业id不能为空！");
 		 }
-		 List<PayWorkingGroup> list = payWorkingGroupService.queryListByNotCompany(companyId);
+		 List<PayWorkingGroup> list = payWorkingGroupService.queryListByNotCompany(companyId,workingGroupProject);
 		 return Result.OK(list);
 	 }
 	/**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
index f4761483..24322ad4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
@@ -52,7 +52,7 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
      * @Return
      * @Exception
      */
-    List<PayWorkingGroup> queryListByNotCompany(@Param("companyId") String companyId);
+    List<PayWorkingGroup> queryListByNotCompany(@Param("companyId") String companyId, @Param("workingGroupProject") String workingGroupProject);
 
     /**
      * @Description 工作组统计
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
index 2aeea262..3ec03dc8 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
@@ -132,6 +132,9 @@
             update_time AS updateTime
         FROM pay_working_group
         WHERE id NOT IN (SELECT working_group_id FROM pay_working_group_subitem WHERE charge_company_id=#{companyId})
+        <if test="workingGroupProject != null and workingGroupProject != ''">
+            and working_group_project like concat('%',#{workingGroupProject},'%')
+        </if>
     </select>
     <sql id="v_statistical_confirm_sql">
         projectId,
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java
index 86ef19b0..a5fda272 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java
@@ -9,7 +9,6 @@ import com.jero.project.entity.PayWorkingGroup;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.statistics.entity.*;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -45,7 +44,7 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
     * @Return
     * @Exception
     */
-    List<PayWorkingGroup> queryListByNotCompany(String companyId);
+    List<PayWorkingGroup> queryListByNotCompany(String companyId, String workingGroupProject);
     /**
     * @Description 根据id删除
     * @Author  lqt
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
index 525f4684..da2ad612 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
@@ -94,8 +94,8 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
     }
 
     @Override
-    public List<PayWorkingGroup> queryListByNotCompany(String companyId) {
-        return payWorkingGroupMapper.queryListByNotCompany(companyId);
+    public List<PayWorkingGroup> queryListByNotCompany(String companyId, String workingGroupProject) {
+        return payWorkingGroupMapper.queryListByNotCompany(companyId,workingGroupProject);
     }
 
     @Override