修复行为人子女数模型

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)));

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 "