From 896c44937a50531b0f98c07c0c38e917e156ef1f Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 17 May 2023 15:21:38 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=81=E4=B8=9A=E6=9D=A5=E6=AC=BE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=20=E4=BC=81=E4=B8=9A=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=E5=92=8C=E5=A4=9A=E9=80=89=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/project/mapper/xml/PayWorkingGroupMapper.xml  | 10 ++++++++--
 .../CompanyComeMoneyStatisticsController.java          | 10 ++++++++++
 .../jero/statistics/entity/CompanyComeMoneySearch.java |  3 +++
 3 files changed, 21 insertions(+), 2 deletions(-)

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 3ec03dc8..c9689828 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
@@ -1331,7 +1331,10 @@
                 concat(#{companyComeMoneySearch.year}, '%')
             </if>
             <if test="companyComeMoneySearch.chargeCompanyId != null and companyComeMoneySearch.chargeCompanyId != ''">
-                AND chargeCompanyId = #{companyComeMoneySearch.chargeCompanyId}
+                <foreach item="item" index="index" collection="companyComeMoneySearch.chargeCompanyIds"
+                         open="AND chargeCompanyId in (" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <!--<choose>
                 <when test="companyComeMoneySearch.paymentMonth != null and companyComeMoneySearch.paymentMonth != ''">
@@ -1436,7 +1439,10 @@
                 concat(#{companyComeMoneySearch.year}, '%')
             </if>
             <if test="companyComeMoneySearch.chargeCompanyId != null and companyComeMoneySearch.chargeCompanyId != ''">
-                AND chargeCompanyId = #{companyComeMoneySearch.chargeCompanyId}
+                <foreach item="item" index="index" collection="companyComeMoneySearch.chargeCompanyIds"
+                         open="AND chargeCompanyId in (" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <!--<choose>
                 <when test="companyComeMoneySearch.paymentMonth != null and companyComeMoneySearch.paymentMonth != ''">
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
index 819035ee..621d4794 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
@@ -1,5 +1,8 @@
 package com.jero.statistics.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
@@ -16,6 +19,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -59,6 +63,12 @@ public class CompanyComeMoneyStatisticsController {
     public Result<?> list(CompanyComeMoneySearch companyComeMoneySearch,
                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        String chargeCompanyId = companyComeMoneySearch.getChargeCompanyId();
+        if (StringUtils.isNotBlank(chargeCompanyId)) {
+            List<String> chargeCompanyIds = StrUtil.split(chargeCompanyId, ',');
+            companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds);
+        }
+
         Page<CompanyComeMoneyList> page = new Page<>(pageNo, pageSize);
         IPage<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompany(page, companyComeMoneySearch, null);
         HashMap<String, Object> hashMap = new HashMap<>();
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java
index 1341be74..2055f662 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java
@@ -6,6 +6,7 @@ import lombok.Data;
 
 import javax.validation.constraints.DecimalMax;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @author zql
@@ -18,6 +19,8 @@ public class CompanyComeMoneySearch {
     @ApiModelProperty(value = "来款企业id")
     private String chargeCompanyId;
 
+    private List<String> chargeCompanyIds;
+
     @ApiModelProperty(value = "来款年份")
     private String year;