Merge remote-tracking branch 'origin/master'

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

@@ -16,30 +16,10 @@ public interface GBaseCSCZRKMapper extends BaseMapper<GBaseCSCZRK> {
             + "on a.mqgmsfzhm = b.gmsfhm where a.mqgmsfzhm is not null and b.whcdmc is not null and a.mqgmsfzhm != a.gmsfhm")
     List<GBaseCSCZRK> selectMotherEducation();
 
-    // 户籍类型
-    @Select("<script>"
-            + "SELECT gmsfhm, hlxmc FROM dwd_ry_kxgxzyk_csczrk WHERE hlxmc is not null and gmsfhm IN "
-            + "<foreach item='item' index='index' collection='list' open='(' separator=',' close=')'>"
-            + "#{item}"
-            + "</foreach>"
-            + "</script>")
-    List<GBaseCSCZRK> selectDomicileType(List<String> idNos);
-
     // 户籍类型
     @Select("SELECT a.gmsfhm, a.hlxmc FROM dwd_ry_kxgxzyk_csczrk a inner join csga_wdpcdb.wdpc_person b on a.gmsfhm = b.id_code WHERE a.hlxmc is not null")
     List<GBaseCSCZRK> selectDomicileType();
 
-    // 父母婚姻变故
-    @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 or a.mqgmsfzhm = b.female_id_code)) a "
-            + "WHERE gmsfhm IN "
-            + "<foreach item='item' index='index' collection='list' open='(' separator=',' close=')'>"
-            + "#{item}"
-            + "</foreach>"
-            + "</script>")
-    List<GBaseCSCZRK> selectParentsDivorce(List<String> idNos);
-
     // 父母婚姻变故
     @Select("select distinct a.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 inner join csga_wdpcdb.wdpc_person b on a.gmsfhm = b.id_code;")
@@ -86,25 +66,6 @@ public interface GBaseCSCZRKMapper extends BaseMapper<GBaseCSCZRK> {
             + "</script>")
     List<GBaseCSCZRK> selectMotherDiePeople(List<String> part);
 
-    // 行为人子女数
-    @Select("<script>"
-            + "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 "
-            + "<foreach item='item' index='index' collection='list' open='(' separator=',' close=')'>"
-            + "#{item}"
-            + "</foreach> ) c GROUP BY c.gmsfhm"
-            + "</script>")
-    List<GBaseCSCZRK> selectChildNo(List<String> idNos);
-
     // 行为人子女数
     @Select("SELECT c.gmsfhm, SUM(CASE WHEN c.mc1 = '子' AND c.mc2 IN ('孙子','孙女') THEN 1 "
             + "WHEN c.mc1 = '女' AND c.mc2 IN ('外孙子','外孙女') THEN 1 "

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

@@ -78,13 +78,6 @@ public interface GBaseJJDMapper extends BaseMapper<GBaseJJD> {
     @Select(" select jjdbh, bjdh,bjrxm ,bjrzjhm, bjnr, cjqk, bjsj from dwd_asj_zhtx_jjd where (bjnr like '%家暴%' or cjqk like '%家暴%' or jqxzmc like '%家庭暴力%' or cjqk like '%家庭暴力%'  or bjnr like '%家庭暴力%') and SUBSTR(jqxzdm, 1, 2) != '99' and bjsj >= #{start}")
     List<GBaseJJD> selectHomeViolence(@Param("start")String start);
 
-    // 与子女关系
-    @Select(" select jjdbh, bjrzjhm, bjnr,cjqk ,bjsj from dwd_asj_zhtx_jjd "
-            + "where (jqxzmc like '%纠纷%' or jqxzmc like '%矛盾%') "
-            + "AND (bjnr like '%孩子%' OR bjnr like '%儿子%' OR bjnr like '%女儿%' OR bjnr like '%子女%' OR cjqk like '%孩子%' OR cjqk like '%儿子%' OR cjqk like '%女儿%' OR cjqk like '%子女%') "
-            + "AND bjrzjhm is not null and bjsj > '2019-12-06 00:00:00' and substr(jqxzdm, 1, 2) != '99';")
-    List<GBaseJJD> selectFiliation(List<String> idNos);
-
     // 与子女关系
     @Select(" select a.jjdbh, a.bjrzjhm, a.bjnr,a.cjqk ,a.bjsj from dwd_asj_zhtx_jjd a inner join csga_wdpcdb.wdpc_person b on a.bjrzjhm = b.id_code "
             + "where (a.jqxzmc like '%纠纷%' or a.jqxzmc like '%矛盾%') "

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

@@ -12,16 +12,8 @@ import java.util.List;
  * @since 1.8
  */
 public interface GBaseWFRWFXXMapper extends BaseMapper<GBaseWFRWFXX> {
-    @Select("select b.ajbh, b.zjhm, b.ajmc, b.jysm, b.djrq, " +
-            "(SELECT COUNT(DISTINCT a2.ajbh) " +
-            "FROM dwd_asj_zfba_wfrwfxx a2 " +
-            "WHERE a2.zjhm = b.zjhm AND a.ajbzdm = 1) count_num " +
-            "from dwd_asj_zfba_ajjbxx a " +
-            "join dwd_asj_zfba_wfrwfxx b on a.ajbh = b.ajbh " +
-            "where a.ajbzdm = 1;")
-    List<GBaseWFRWFXX> selectCriminalPunishmentOld();
 
-    @Select("select b.ajbh, b.zjhm, b.ajmc, b.jysm, b.djrq, " +
+    @Select("select b.ajbh, b.zjhm, b.ajmc, b.jysm, b.djrq " +
             "from dwd_asj_zfba_ajjbxx a " +
             "join dwd_asj_zfba_wfrwfxx b on a.ajbh = b.ajbh " +
             "inner join csga_wdpcdb.wdpc_person c on b.zjhm = c.id_code " +

src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcGrjdJsbryMapper.java

@@ -13,14 +13,6 @@ import java.util.List;
  */
 public interface WdpcGrjdJsbryMapper extends BaseMapper<WdpcGrjdJsbry> {
 
-    @Select("<script>"
-            + "select id_code, actual_time, actual_id from wdpc_grjd_jsbry where id_code in "
-            + "<foreach item='item' index='index' collection='list' open='(' separator=',' close=')'>"
-            + "#{item}"
-            + "</foreach>"
-            + "</script>")
-    List<WdpcGrjdJsbry> selectByIdNos(List<String> idNos);
-
     @Select("select a.id_code, a.actual_time, a.actual_id from wdpc_grjd_jsbry a inner join negative.risk_personal b on a.id_code = b.id_code;")
     List<WdpcGrjdJsbry> selectByIdNos();
 }

src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcSqjzryMapper.java

@@ -12,13 +12,6 @@ import java.util.List;
  * @since 1.8
  */
 public interface WdpcSqjzryMapper extends BaseMapper<WdpcSqjzry> {
-    @Select("<script>"
-            + "select id_code, sentence_organization_name, correct_end_time, correct_begin_time, action_place, crime_describe from wdpc_grjd_sqjzry where id_code in "
-            + "<foreach item='item' index='index' collection='list' open='(' separator=',' close=')'>"
-            + "#{item}"
-            + "</foreach>"
-            + "</script>")
-    List<WdpcSqjzry> selectByIdNos(List<String> idNos);
 
     @Select("select a.id_code, a.sentence_organization_name, a.correct_end_time, a.correct_begin_time, a.action_place, a.crime_describe from wdpc_grjd_sqjzry a inner join negative.risk_personal b on a.id_code = b.id_code;")
     List<WdpcSqjzry> selectByIdNos();

src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXdryMapper.java

@@ -12,14 +12,6 @@ import java.util.List;
  * @since 1.8
  */
 public interface WdpcXdryMapper extends BaseMapper<WdpcXdry> {
-    @Select("<script>"
-            + "select sfzh, xm, fxdw_dwmc, fxjsrq, fxqsrq, chdw_dwmc, gkxz_mc, jlsmc, rsrq, csrq from wdpc_grjd_xdry "
-            + "where (swrq is not null or swyy is not null) and sfzh in "
-            + "<foreach item='item' index='index' collection='list' open='(' separator=',' close=')'>"
-            + "#{item}"
-            + "</foreach>"
-            + "</script>")
-    List<WdpcXdry> selectXIDU(List<String> idCard);
 
     @Select("select a.sfzh, a.xm, a.fxdw_dwmc, a.fxjsrq, a.fxqsrq, a.chdw_dwmc, a.gkxz_mc, a.jlsmc, a.rsrq, a.csrq from wdpc_grjd_xdry a "
             + "inner join negative.risk_personal b on a.sfzh = b.id_code where (a.swrq is not null or a.swyy is not null);")

src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXfsjCsDetailMapper.java

@@ -12,68 +12,22 @@ import java.util.List;
  * @since 1.8
  */
 public interface WdpcXfsjCsDetailMapper extends BaseMapper<WdpcXfsjCsDetail> {
-    @Select("<script>"
-            + "select id_code, count(id_code) count_num, detail from wdpc_grjd_xfsj_cs_detail "
-            + "where (detail like '%退%' or detail like '%迁%' or detail like '%军%') "
-            + "and (detail not like '%投诉%' and detail not like '%举报%' and detail not like '%不公%' and detail not like '%交房%') "
-            + "and id_code in "
-            + "<foreach item='item' index='index' collection='list' open='(' separator=',' close=')'>"
-            + "#{item}"
-            + "</foreach>"
-            + " group by id_code"
-            + "</script>")
-    List<WdpcXfsjCsDetail> selectPetitionContent5(List<String> idNos);
 
     @Select("select a.id_code, count(a.id_code) count_num, a.detail from wdpc_grjd_xfsj_cs_detail a inner join negative.risk_personal b on a.id_code = b.id_code "
             + "where (a.detail like '%退%' or a.detail like '%迁%' or a.detail like '%军%') "
             + "and (a.detail not like '%投诉%' and a.detail not like '%举报%' and a.detail not like '%不公%' and a.detail not like '%交房%');")
     List<WdpcXfsjCsDetail> selectPetitionContent5();
 
-    @Select("<script>"
-            + "select id_code, count(id_code) count_num, detail from wdpc_grjd_xfsj_cs_detail "
-            + "where (detail like '%投诉%' or detail like '%举报%') "
-            + "and (detail not like '%退%' and detail not like '%迁%' and detail not like '%军%' and detail not like '%不公%' and detail not like '%交房%') "
-            + "and id_code in "
-            + "<foreach item='item' index='index' collection='list' open='(' separator=',' close=')'>"
-            + "#{item}"
-            + "</foreach>"
-            + " group by id_code"
-            + "</script>")
-    List<WdpcXfsjCsDetail> selectPetitionContent3(List<String> idNos);
-
     @Select("select a.id_code, count(a.id_code) count_num, a.detail from wdpc_grjd_xfsj_cs_detail a inner join negative.risk_personal b on a.id_code = b.id_code "
             + "where (a.detail like '%投诉%' or a.detail like '%举报%') "
             + "and (a.detail not like '%退%' and a.detail not like '%迁%' and a.detail not like '%军%' and a.detail not like '%不公%' and a.detail not like '%交房%');")
     List<WdpcXfsjCsDetail> selectPetitionContent3();
 
-    @Select("<script>"
-            + "select id_code, count(id_code) count_num, detail from wdpc_grjd_xfsj_cs_detail "
-            + "where (detail like '%不公%' or detail like '%交房%') "
-            + "and (detail not like '%退%' and detail not like '%迁%' and detail not like '%军%' and detail not like '%投诉%' and detail not like '%举报%') "
-            + "and id_code in "
-            + "<foreach item='item' index='index' collection='list' open='(' separator=',' close=')'>"
-            + "#{item}"
-            + "</foreach>"
-            + " group by id_code"
-            + "</script>")
-    List<WdpcXfsjCsDetail> selectPetitionContent2(List<String> idNos);
-
     @Select("select a.id_code, count(a.id_code) count_num, a.detail from wdpc_grjd_xfsj_cs_detail a inner join negative.risk_personal b on a.id_code = b.id_code "
             + "where (a.detail like '%不公%' or a.detail like '%交房%') "
             + "and (a.detail not like '%退%' and a.detail not like '%迁%' and a.detail not like '%军%' and a.detail not like '%投诉%' and a.detail not like '%举报%');")
     List<WdpcXfsjCsDetail> selectPetitionContent2();
 
-    @Select("<script>"
-            + "select distinct id_code from wdpc_grjd_xfsj_cs_detail "
-            + "where satisfaction_code = '1' "
-            + "and id_code in "
-            + "<foreach item='item' index='index' collection='list' open='(' separator=',' close=')'>"
-            + "#{item}"
-            + "</foreach>"
-            + " group by id_code"
-            + "</script>")
-    List<WdpcXfsjCsDetail> selectPetitionDissatisfied(List<String> idNos);
-
     @Select("select distinct a.id_code from wdpc_grjd_xfsj_cs_detail a inner join negative.risk_personal b on a.id_code = b.id_code "
             + "where a.satisfaction_code = '1' "
             + "group by a.id_code")

src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXmsfryMapper.java

@@ -12,13 +12,6 @@ import java.util.List;
  * @since 1.8
  */
 public interface WdpcXmsfryMapper extends BaseMapper<WdpcXmsfry> {
-    @Select("<script>"
-            + "select id_code, crime_name, sentence_time, prison_begin, prison_end, prison_organization from wdpc_grjd_xmsfry where id_code in "
-            + "<foreach item='item' index='index' collection='list' open='(' separator=',' close=')'>"
-            + "#{item}"
-            + "</foreach>"
-            + "</script>")
-    List<WdpcXmsfry> selectByIdNos(List<String> idNos);
 
     @Select("select a.id_code, a.crime_name, a.sentence_time, a.prison_begin, a.prison_end, a.prison_organization from wdpc_grjd_xmsfry a inner join negative.risk_personal b on a.id_code = b.id_code;")
     List<WdpcXmsfry> selectByIdNos();