From ee4459fb2fa972d37bc80e2f2607436af7c0b6c2 Mon Sep 17 00:00:00 2001
From: zhangheng <test@test.test>
Date: Tue, 9 Sep 2025 14:47:05 +0800
Subject: [PATCH] =?UTF-8?q?##=20bug371=20=E4=B8=9A=E7=BB=A9=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E9=A1=B5=EF=BC=8C=E9=80=89=E4=BA=86=E9=9A=B6=E5=B1=9E?=
 =?UTF-8?q?=E4=BD=93=E7=B3=BB=E6=90=9C=E7=B4=A2=E5=90=8E=E7=82=B9=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=EF=BC=8C=E5=AF=BC=E5=87=BA=E7=9A=84excel=E6=98=AF?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=EF=BC=8C=E5=BA=94=E8=AF=A5=E5=8F=AA?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=BD=93=E5=89=8D=E6=90=9C=E7=B4=A2=E7=9A=84?=
 =?UTF-8?q?=E4=BD=93=E7=B3=BB=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzs/member/base/service/impl/CuMemberServiceImpl.java   | 6 ++++++
 .../com/hzs/member/census/param/CensusSummaryParam.java     | 4 ++++
 .../main/resources/mapper/member/base/CuMemberMapper.xml    | 4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
index c31cea0e..fd52f8e1 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
@@ -2462,6 +2462,12 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
         for (String day : days) {
             censusSummaryParam.setTime(day);
             censusSummaryParam.setPkCountry(SecurityUtils.getPkCountry());
+            // 将体系转换成集合类型
+            if (censusSummaryParam.getPkBdVertexStr() != null) {
+                censusSummaryParam.setPkBdVertexStrList(Arrays.stream(censusSummaryParam.getPkBdVertexStr().split(","))
+                        .map(Integer::valueOf)
+                        .collect(Collectors.toList()));
+            }
             List<MemberMeritsSummaryVo> memberMeritsSummaryVoList = baseMapper.queryDateBySummary(censusSummaryParam);
             Map<Integer, MemberMeritsSummaryVo> memberMeritsSummaryMap = memberMeritsSummaryVoList.stream().collect(Collectors.toMap(MemberMeritsSummaryVo::getOrderType, Function.identity()));
 
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/census/param/CensusSummaryParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/census/param/CensusSummaryParam.java
index 80c417ea..a18039e7 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/census/param/CensusSummaryParam.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/census/param/CensusSummaryParam.java
@@ -58,4 +58,8 @@ public class CensusSummaryParam {
      * 体系
      */
     private String pkBdVertexStr;
+    /**
+     * 体系集合
+     */
+    private List<Integer> pkBdVertexStrList;
 }
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
index e89a89ac..7214db1e 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
@@ -2637,9 +2637,9 @@
         and sa.DEL_FLAG = 0
         and to_char(sa.pay_time, 'yyyy-mm-dd') = #{time}
         and sa.PK_COUNTRY = #{pkCountry}
-        <if test="pkVertex!=null and pkVertex.size> 0 ">
+        <if test="pkBdVertexStrList!=null and pkBdVertexStrList.size> 0 ">
             and cm.PK_VERTEX in
-            <foreach collection="pkVertex" item="item" open="(" close=")" separator=",">
+            <foreach collection="pkBdVertexStrList" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>