From c5916b29f8d72003b1b1440dd97230aa35b966b0 Mon Sep 17 00:00:00 2001
From: sjh <shujiehao@foxmail.com>
Date: Tue, 10 Dec 2024 12:53:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=8C=E4=B8=BA=E4=BA=BA?=
 =?UTF-8?q?=E5=AD=90=E5=A5=B3=E6=95=B0=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervisiondata/event/ApplicationEvent.java  |  8 ++++----
 .../mapper/dwd/GBaseCSCZRKMapper.java            | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
index 1f4e5e8..7919273 100644
--- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
+++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
@@ -154,10 +154,10 @@ public class ApplicationEvent {
 //            pointService.syncDomicileType(initDomain(List.of(114)));
 //            pointService.syncCriminalPunishment(initDomain(List.of(115)));
 //            pointService.syncAdministrativePunishment(initDomain(List.of(116)));
-            pointService.syncParentsDivorce(initDomain(List.of(117)));
-            pointService.syncFamilyDie(initDomain(List.of(118)));
-            pointService.syncFatherDie(initDomain(List.of(119)));
-            pointService.syncMotherDie(initDomain(List.of(120)));
+//            pointService.syncParentsDivorce(initDomain(List.of(117)));
+//            pointService.syncFamilyDie(initDomain(List.of(118)));
+//            pointService.syncFatherDie(initDomain(List.of(119)));
+//            pointService.syncMotherDie(initDomain(List.of(120)));
             pointService.syncChildNo(initDomain(List.of(121)));
             pointService.syncXIDU(initDomain(List.of(122)));
             pointService.syncFiliation(initDomain(List.of(123)));
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 897a5f4..c5dd944 100644
--- a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java
+++ b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java
@@ -79,14 +79,14 @@ public interface GBaseCSCZRKMapper extends BaseMapper<GBaseCSCZRK> {
 
     // 行为人子女数
     @Select("<script>"
-            + "SELECT c.gmsfhm, SUM(CASE WHEN c.mc1 = '子' AND c.m2 IN ('孙子','孙女') THEN 1 "
-            + "WHEN c.mc1 = '女' AND c.m2 IN ('外孙子','外孙女') THEN 1 "
-            + "WHEN c.mc1 IN ('户主','本人','妻','夫','配偶') AND c.m2 IN ('子','女','独生子','独生女','长子','次子','三子','四子','五子','二女','三女','四女','五女') THEN 1 "
-            + "WHEN c.mc1 IN ('父亲','母亲') AND c.m2 IN ('户主','本人','兄','弟','姐姐','妹妹') THEN 1 "
-            + "WHEN c.mc1 IN ('兄','弟') AND c.m2 IN ('侄女','侄子') THEN 1 "
-            + "WHEN c.mc1 IN ('姐姐','妹妹') AND c.m2 IN ('外甥女','外甥') THEN 1 "
-            + "WHEN c.mc1 IN ('独生女','长女','二女','儿媳') AND c.m2 IN ('外孙子','外孙女') THEN 1 "
-            + "WHEN c.mc1 IN ('独生子','长子','次子','女婿') AND c.m2 IN ('孙子','孙女') THEN 1 "
+            + "SELECT c.gmsfhm, SUM(CASE WHEN c.mc1 = '子' AND c.mc2 IN ('孙子','孙女') THEN 1 "
+            + "WHEN c.mc1 = '女' AND c.mc2 IN ('外孙子','外孙女') THEN 1 "
+            + "WHEN c.mc1 IN ('户主','本人','妻','夫','配偶') AND c.mc2 IN ('子','女','独生子','独生女','长子','次子','三子','四子','五子','二女','三女','四女','五女') THEN 1 "
+            + "WHEN c.mc1 IN ('父亲','母亲') AND c.mc2 IN ('户主','本人','兄','弟','姐姐','妹妹') THEN 1 "
+            + "WHEN c.mc1 IN ('兄','弟') AND c.mc2 IN ('侄女','侄子') THEN 1 "
+            + "WHEN c.mc1 IN ('姐姐','妹妹') AND c.mc2 IN ('外甥女','外甥') THEN 1 "
+            + "WHEN c.mc1 IN ('独生女','长女','二女','儿媳') AND c.mc2 IN ('外孙子','外孙女') THEN 1 "
+            + "WHEN c.mc1 IN ('独生子','长子','次子','女婿') AND c.mc2 IN ('孙子','孙女') THEN 1 "
             + "ELSE 0 END) AS score from "
             + "(SELECT a.gmsfhm, a.yhzgxmc mc1, b.yhzgxmc mc2 FROM dwd_ry_kxgxzyk_csczrk a JOIN dwd_ry_kxgxzyk_csczrk b ON a.hh = b.hh "
             + "WHERE a.gmsfhm != b.gmsfhm and a.gmsfhm IN "