罪名改为刑事案件

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

@@ -105,7 +105,7 @@ public class ApplicationEvent {
         DepartUtil.init(ryRepository, departRepository);
         LocalDateTime end = LocalDate.now().minusDays(1).atTime(23,59,59);
         CompletableFutureUtil.runSync(() -> {
-            personalService.init(List.of(115,116));
+            personalService.init(List.of(76));
 //            personalService.pullInvestigate();
 //            personalService.pullPsychosis();
 //            gBaseSHRWFRService.pullAndSave(LocalDateTime.of(2019,12,6,0,0,0), end);
@@ -141,13 +141,13 @@ public class ApplicationEvent {
 //            gBaseJJDService.syncMarryDispute(initDomain(List.of(72)));
 //            gBaseJJDService.syncNeighborAndColleagueDispute(initDomain(List.of(73)));
 //            gBaseJJDService.syncBullying(initDomain(List.of(74)));
-//            gBaseSHRWFRService.crimeName(initDomain(List.of(76)));
+            gBaseSHRWFRService.crimeName(initDomain(List.of(76)));
 //            pointService.syncIsPetition(initDomain(List.of(40)));
 //            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.syncAdministrativePunishment(initDomain(List.of(116)));
+//            pointService.syncCriminalPunishment(initDomain(List.of(115)));
+//            pointService.syncAdministrativePunishment(initDomain(List.of(116)));
 //            pointService.syncParentsDivorce(initDomain(List.of(117)));
 //            gBaseJJDService.syncOtherContradict(initDomain(List.of(75)));
 //            pointService.syncFamilyDie(initDomain(List.of(118)));

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

@@ -38,8 +38,9 @@ public interface GBaseWFRXXMapper extends BaseMapper<GBaseWFRXX> {
      * @param endTime 查询结束时间（处警时间）
      * @return 列表
      */
-    @Select(" select  ajbh,zjhm,sxzm, sxzmdm,lrsj from dwd_ry_zfba_wfryxx " +
-            " where lrsj between #{startTime} and #{endTime} " +
+    @Select(" select  a.ajbh,a.zjhm,a.sxzm, a.sxzmdm,a.lrsj from dwd_ry_zfba_wfryxx as a " +
+            " inner join dwd_asj_zfba_ajjbxx as b on a.ajbh=b.ajbh " +
+            " where b.ajbzdm = 1 and lrsj between #{startTime} and #{endTime} " +
             " and ajbh is not null and zjhm is not null")
     List<GBaseWFRXX> selectFiveYearsCombatCrime(@Param("startTime")String startTime, @Param("endTime")String endTime);
     /**