修复118模型

src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java

@@ -144,7 +144,7 @@ public class ApplicationEvent {
 //            pointService.syncCriminalPunishment(initDomain(List.of(115)));
 //            pointService.syncAdministrativePunishment(initDomain(List.of(116)));
 //            pointService.syncParentsDivorce(initDomain(List.of(117)));
-//            pointService.syncFamilyDie(initDomain(List.of(118)));  // 12-16报错
+            pointService.syncFamilyDie(initDomain(List.of(118)));
 //            pointService.syncFatherDie(initDomain(List.of(119)));
 //            pointService.syncMotherDie(initDomain(List.of(120)));
 //            pointService.syncChildNo(initDomain(List.of(121)));

src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java

@@ -58,6 +58,34 @@ public interface GBaseCSCZRKMapper extends BaseMapper<GBaseCSCZRK> {
             + ")")
     List<GBaseCSCZRK> selectFamilyPeople();
 
+    @Select("select distinct a.gmsfhm, c.gmsfhm family_id from dwd_ry_kxgxzyk_csczrk a inner join csga_wdpcdb.wdpc_person b on a.gmsfhm = b.id_code "
+            + "inner join dwd_ry_kxgxzyk_csczrk c ON a.hh = c.hh "
+            + "where a.gmsfhm != c.gmsfhm and ("
+            + "( a.mqgmsfzhm IS NULL AND a.fqgmsfzhm IS NULL ) "
+            + ")")
+    List<GBaseCSCZRK> selectFamilyPeople1();
+
+    @Select("select distinct a.gmsfhm, c.gmsfhm family_id from dwd_ry_kxgxzyk_csczrk a inner join csga_wdpcdb.wdpc_person b on a.gmsfhm = b.id_code "
+            + "inner join dwd_ry_kxgxzyk_csczrk c ON a.hh = c.hh "
+            + "where a.gmsfhm != c.gmsfhm and ("
+            + "( a.mqgmsfzhm IS NULL AND a.fqgmsfzhm != c.gmsfhm ) "
+            + ")")
+    List<GBaseCSCZRK> selectFamilyPeople2();
+
+    @Select("select distinct a.gmsfhm, c.gmsfhm family_id from dwd_ry_kxgxzyk_csczrk a inner join csga_wdpcdb.wdpc_person b on a.gmsfhm = b.id_code "
+            + "inner join dwd_ry_kxgxzyk_csczrk c ON a.hh = c.hh "
+            + "where a.gmsfhm != c.gmsfhm and ("
+            + "( a.fqgmsfzhm IS NULL AND a.mqgmsfzhm != c.gmsfhm ) "
+            + ")")
+    List<GBaseCSCZRK> selectFamilyPeople3();
+
+    @Select("select distinct a.gmsfhm, c.gmsfhm family_id from dwd_ry_kxgxzyk_csczrk a inner join csga_wdpcdb.wdpc_person b on a.gmsfhm = b.id_code "
+            + "inner join dwd_ry_kxgxzyk_csczrk c ON a.hh = c.hh "
+            + "where a.gmsfhm != c.gmsfhm and ("
+            + "(a.fqgmsfzhm IS NOT NULL AND a.mqgmsfzhm IS NOT NULL AND a.fqgmsfzhm != c.gmsfhm AND a.mqgmsfzhm != c.gmsfhm) "
+            + ")")
+    List<GBaseCSCZRK> selectFamilyPeople4();
+
     @Select("select distinct a.gmsfhm, a.fqgmsfzhm father_id from dwd_ry_kxgxzyk_csczrk a INNER JOIN csga_wdpcdb.wdpc_person b ON a.gmsfhm = b.id_code where a.fqgmsfzhm is not null;")
     List<GBaseCSCZRK> selectFather();
 

src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java

@@ -1456,7 +1456,13 @@ public class PointServiceImpl implements PointService {
         Map<String, Integer> idCode = new HashMap<>();
         List<String> list = new ArrayList<>();
         log.info("模型118开始查询");
-        List<GBaseCSCZRK> familyPeople = cSCZRKRepository.getBaseMapper().selectFamilyPeople();
+        List<GBaseCSCZRK> familyPeople = new ArrayList<>(cSCZRKRepository.getBaseMapper().selectFamilyPeople1());
+        log.info("模型118查询familyPeople1结果数：{}", familyPeople.size());
+        familyPeople.addAll(cSCZRKRepository.getBaseMapper().selectFamilyPeople2());
+        log.info("模型118查询familyPeople2结果数：{}", familyPeople.size());
+        familyPeople.addAll(cSCZRKRepository.getBaseMapper().selectFamilyPeople3());
+        log.info("模型118查询familyPeople3结果数：{}", familyPeople.size());
+        familyPeople.addAll(cSCZRKRepository.getBaseMapper().selectFamilyPeople4());
         log.info("模型118查询familyPeople结果数：{}", familyPeople.size());
         Map<String, List<String>> familyMap = familyPeople.stream().collect(Collectors.groupingBy(GBaseCSCZRK::getGmsfhm,
                 Collectors.mapping(GBaseCSCZRK::getFamilyId, Collectors.toList())));