Merge remote-tracking branch 'origin/master'

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>"

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