From 062c9eb5e48343d56871af628b8a89f7605de74a Mon Sep 17 00:00:00 2001
From: sjh <shujiehao@foxmail.com>
Date: Tue, 10 Dec 2024 11:08:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=88=B6=E6=AF=8D=E5=A9=9A?=
 =?UTF-8?q?=E5=A7=BB=E5=8F=98=E6=95=85=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java     | 8 +++-----
 .../supervisiondata/service/impl/PointServiceImpl.java    | 1 +
 2 files changed, 4 insertions(+), 5 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 2204e12..0c8c0ca 100644
--- a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java
+++ b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java
@@ -28,11 +28,9 @@ public interface GBaseCSCZRKMapper extends BaseMapper<GBaseCSCZRK> {
 
     // 父母婚姻变故
     @Select("<script>"
-            + "select distinct gmsfhm from (SELECT DISTINCT a.gmsfhm FROM csga_dwd.dwd_ry_kxgxzyk_csczrk a join csga_wdpcdb.wdpc_grjd_lhxx b " +
-            "on a.fqgmsfzhm = b.male_id_code union all " +
-            "(SELECT DISTINCT a.gmsfhm FROM csga_dwd.dwd_ry_kxgxzyk_csczrk a join csga_wdpcdb.wdpc_grjd_lhxx b " +
-            "on a.mqgmsfzhm = b.female_id_code)) a " +
-            "WHERE gmsfhm IN "
+            + "select distinct gmsfhm from (SELECT DISTINCT a.gmsfhm FROM csga_dwd.dwd_ry_kxgxzyk_csczrk a join csga_wdpcdb.wdpc_grjd_lhxx b "
+            + "on (a.fqgmsfzhm = b.male_id_code or a.mqgmsfzhm = b.female_id_code)) a "
+            + "WHERE gmsfhm IN "
             + "<foreach item='item' index='index' collection='list' open='(' separator=',' close=')'>"
             + "#{item}"
             + "</foreach>"
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 c4403d7..0f193a9 100644
--- a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java
+++ b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java
@@ -405,6 +405,7 @@ public class PointServiceImpl implements PointService {
         log.info("模型117开始查询");
         for (List<String> idCard : domain.getIdCards()) {
             list.addAll(cSCZRKRepository.getBaseMapper().selectParentsDivorce(idCard));
+            log.info("模型117查询进度 | {}", list.size());
         }
         log.info("模型117查询结果数：{}", list.size());
         Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));