修改受到刑事处罚模型

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

@@ -145,8 +145,8 @@ public class ApplicationEvent {
 //            pointService.syncFatherEducation(initDomain(List.of(112)));
 //            pointService.syncMotherEducation(initDomain(List.of(113)));
 //            pointService.syncDomicileType(initDomain(List.of(114)));
-//            pointService.syncCriminalPunishment(initDomain(List.of(115)));// 需重跑 报错
+            pointService.syncCriminalPunishment(initDomain(List.of(115)));// 需重跑 报错 已修改
-//            pointService.syncAdministrativePunishment(initDomain(List.of(116)));// 需重跑
+            pointService.syncAdministrativePunishment(initDomain(List.of(116)));// 需重跑
 //            pointService.syncParentsDivorce(initDomain(List.of(117)));
             pointService.syncFamilyDie(initDomain(List.of(118)));
             pointService.syncFatherDie(initDomain(List.of(119)));

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

@@ -12,10 +12,10 @@ import java.util.List;
  * @since 1.8
  */
 public interface GBaseWFRWFXXMapper extends BaseMapper<GBaseWFRWFXX> {
-    @Select("select a.ajbh, b.zjhm, b.ajmc, b.jysm, b.djrq, " +
+    @Select("select b.ajbh, b.zjhm, b.ajmc, b.jysm, b.djrq, " +
-            "(SELECT COUNT(DISTINCT a2.ajbh) FROM dwd_asj_zfba_ajjbxx a2 " +
+            "(SELECT COUNT(DISTINCT a2.ajbh) " +
-            "JOIN dwd_asj_zfba_wfrwfxx b2 ON a2.ajbh = b2.ajbh " +
+            "FROM dwd_asj_zfba_wfrwfxx a2 " +
-            "WHERE a2.zjhm = a.zjhm AND a2.ajbzdm = 1) count_num " +
+            "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;")

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

@@ -1178,7 +1178,7 @@ public class PointServiceImpl implements PointService {
                  "中技毕业", "中等专科学校", "高中", "高中毕业", "农业高中毕业" -> 3;// 高中中专
             case "农业初中毕业", "技工学校", "技工学校肄业", "技工学校毕业", "初中", "职业初中毕业", "初中毕业",
                  "初中肆业", "相当初中毕业" -> 4;// 初中
-            case "小学", "小学肄业", "小学毕业", "相当小学毕业", "文盲", "文盲或半文盲", "学龄前儿童" -> 5;// 小学
+            case "小学", "小学肄业", "小学肆业", "小学毕业", "相当小学毕业", "文盲", "文盲或半文盲", "学龄前儿童" -> 5;// 小学
             default -> 0;
         };
     }