From eb920984d92348b3287ed12c3e569101ede98a1a Mon Sep 17 00:00:00 2001
From: sjh <shujiehao@foxmail.com>
Date: Tue, 10 Dec 2024 11:39:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=88=B6=E4=BA=B2=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=81=A5=E5=9C=A8=E7=AD=893=E4=B8=AA=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java    | 7 +++----
 .../supervisiondata/service/impl/PointServiceImpl.java   | 9 ++++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java
index 0c8c0ca..897a5f4 100644
--- a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java
+++ b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java
@@ -2,7 +2,6 @@ package com.biutag.supervisiondata.mapper.dwd;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.biutag.supervisiondata.pojo.entity.dwd.GBaseCSCZRK;
-import com.biutag.supervisiondata.pojo.entity.wdpc2.WdpcHZCRYXX;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -58,7 +57,7 @@ public interface GBaseCSCZRKMapper extends BaseMapper<GBaseCSCZRK> {
             + "</foreach>"
             + ")"
             + "</script>")
-    List<GBaseCSCZRK> selectFamilyDiePeople(List<WdpcHZCRYXX> part);
+    List<GBaseCSCZRK> selectFamilyDiePeople(List<String> part);
 
     // 父亲是否健在
     @Select("<script>"
@@ -67,7 +66,7 @@ public interface GBaseCSCZRKMapper extends BaseMapper<GBaseCSCZRK> {
             + "#{item}"
             + "</foreach>"
             + "</script>")
-    List<GBaseCSCZRK> selectFatherDiePeople(List<WdpcHZCRYXX> part);
+    List<GBaseCSCZRK> selectFatherDiePeople(List<String> part);
 
     // 母亲是否健在
     @Select("<script>"
@@ -76,7 +75,7 @@ public interface GBaseCSCZRKMapper extends BaseMapper<GBaseCSCZRK> {
             + "#{item}"
             + "</foreach>"
             + "</script>")
-    List<GBaseCSCZRK> selectMotherDiePeople(List<WdpcHZCRYXX> part);
+    List<GBaseCSCZRK> selectMotherDiePeople(List<String> part);
 
     // 行为人子女数
     @Select("<script>"
diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java
index 0f193a9..3fc8197 100644
--- a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java
+++ b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java
@@ -456,7 +456,8 @@ public class PointServiceImpl implements PointService {
                 .toList();
 
         for (List<WdpcHZCRYXX> wdpcHZCRYXXSPart : wdpcHZCRYXXSParts) {
-            list.addAll(cSCZRKRepository.getBaseMapper().selectFatherDiePeople(wdpcHZCRYXXSPart));
+            List<String> ids = wdpcHZCRYXXSPart.stream().map(WdpcHZCRYXX::getIdCode).toList();
+            list.addAll(cSCZRKRepository.getBaseMapper().selectFatherDiePeople(ids));
         }
         log.info("模型119查询结果数：{}", list.size());
         Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));
@@ -507,7 +508,8 @@ public class PointServiceImpl implements PointService {
                 .toList();
 
         for (List<WdpcHZCRYXX> wdpcHZCRYXXSPart : wdpcHZCRYXXSParts) {
-            list.addAll(cSCZRKRepository.getBaseMapper().selectMotherDiePeople(wdpcHZCRYXXSPart));
+            List<String> ids = wdpcHZCRYXXSPart.stream().map(WdpcHZCRYXX::getIdCode).toList();
+            list.addAll(cSCZRKRepository.getBaseMapper().selectMotherDiePeople(ids));
         }
         log.info("模型120查询结果数：{}", list.size());
         Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));
@@ -826,7 +828,8 @@ public class PointServiceImpl implements PointService {
                 .toList();
 
         for (List<WdpcHZCRYXX> wdpcHZCRYXXSPart : wdpcHZCRYXXSParts) {
-            list.addAll(cSCZRKRepository.getBaseMapper().selectFamilyDiePeople(wdpcHZCRYXXSPart));
+            List<String> ids = wdpcHZCRYXXSPart.stream().map(WdpcHZCRYXX::getIdCode).toList();
+            list.addAll(cSCZRKRepository.getBaseMapper().selectFamilyDiePeople(ids));
         }
         log.info("模型118查询结果数：{}", list.size());
         Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));