From 37abdf26584b8717fb6b605475a44d8db844ad3b Mon Sep 17 00:00:00 2001
From: kami <605128600@qq.com>
Date: Tue, 10 Dec 2024 18:03:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=BB=E5=A9=9A=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/biutag/supervisiondata/event/ApplicationEvent.java  | 2 +-
 .../supervisiondata/mapper/wdpc2/WdpcGrjdHyqkbMapper.java   | 6 ++++++
 .../supervisiondata/pojo/entity/wdpc2/WdpcGrjdHyqkb.java    | 2 +-
 .../supervisiondata/service/impl/MarriageServiceImpl.java   | 6 +++---
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
index 1309089..202af41 100644
--- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
+++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
@@ -117,7 +117,7 @@ public class ApplicationEvent {
             petitionService.petitionModelTask(initDomain(List.of(40)));
             riskTaskService.eduModelTask(initDomain(List.of(34)));
             riskTaskService.infoModelTask(initDomain(List.of(32,33)));
-//            marriageService.marriageModelTask(initDomain(List.of(39,51)));
+            marriageService.marriageModelTask(initDomain(List.of(39,51)));
             pointService.syncSecurity(initDomain(List.of(37)));
             habitService.habitModelTask(start, initDomain(List.of(36,60,61,62)));
 
diff --git a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcGrjdHyqkbMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcGrjdHyqkbMapper.java
index 86e0cb0..c2371c0 100644
--- a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcGrjdHyqkbMapper.java
+++ b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcGrjdHyqkbMapper.java
@@ -3,6 +3,9 @@ package com.biutag.supervisiondata.mapper.wdpc2;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.biutag.supervisiondata.pojo.entity.wdpc2.WdpcGrjdHyqkb;
 import com.biutag.supervisiondata.pojo.entity.wdpc2.WdpcGrjdJsbry;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * @author kami on 2024-12-10 17:59:16
@@ -10,4 +13,7 @@ import com.biutag.supervisiondata.pojo.entity.wdpc2.WdpcGrjdJsbry;
  * @since 1.8
  */
 public interface WdpcGrjdHyqkbMapper extends BaseMapper<WdpcGrjdHyqkb> {
+
+    @Select(" select id_code from wdpc_grjd_hyqkb")
+    List<WdpcGrjdHyqkb> selectDistinctInfo();
 }
diff --git a/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc2/WdpcGrjdHyqkb.java b/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc2/WdpcGrjdHyqkb.java
index 2cb7263..85734d7 100644
--- a/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc2/WdpcGrjdHyqkb.java
+++ b/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc2/WdpcGrjdHyqkb.java
@@ -12,7 +12,7 @@ import java.io.Serializable;
  * @since 1.8
  */
 @Data
-@TableName("`wdpc_grjd_jsbry`")
+@TableName("`wdpc_grjd_hyqkb`")
 public class WdpcGrjdHyqkb implements Serializable {
     @TableField("`id_code`")
     String idCode;
diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java
index 99a70aa..d8470e7 100644
--- a/src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java
+++ b/src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java
@@ -11,9 +11,7 @@ import com.biutag.supervisiondata.pojo.entity.dwd.GBaseHY;
 import com.biutag.supervisiondata.pojo.entity.mine.RiskModelTaskClue;
 import com.biutag.supervisiondata.pojo.entity.mine.RiskPersonal;
 import com.biutag.supervisiondata.pojo.entity.mine.RiskTask;
-import com.biutag.supervisiondata.repository.GBaseHYRepository;
-import com.biutag.supervisiondata.repository.RiskModelTaskClueRepository;
-import com.biutag.supervisiondata.repository.RiskTaskRepository;
+import com.biutag.supervisiondata.repository.*;
 import com.biutag.supervisiondata.service.MarriageService;
 import com.biutag.supervisiondata.service.RiskModelTaskClueService;
 import com.biutag.supervisiondata.util.BhUtil;
@@ -46,6 +44,8 @@ public class MarriageServiceImpl implements MarriageService {
 
     private final GBaseHYRepository hyRepository;
 
+    private final WdpcGrjdHyqkbRepository hyqkbRepository;
+
     @Override
     public void marriageModelTask(TaskParamDomain domain) {
         // 婚姻不用管管控