From c1fef33d83304b2bd06e2170d0bec52523c6abd4 Mon Sep 17 00:00:00 2001
From: lroyia <lirh@chinaweal.com.cn>
Date: Tue, 24 Feb 2026 15:13:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E6=B3=A8=E9=94=80=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E8=AE=B0=E5=BD=95=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/XrForceDeregisterSpeServiceImpl.java | 26 +++++++++++++++++++
 .../revoke/entity/BatchRevokePushRecord.java  | 10 +++++--
 .../service/impl/TsbizrevlistServiceImpl.java |  1 +
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java
index 5ecb60f..9c431ed 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java
@@ -26,6 +26,8 @@ import com.chinaweal.aiccs.aiccs.force.service.IXrForceDeregisterService;
 import com.chinaweal.aiccs.aiccs.force.service.IXrForceDeregisterSpeService;
 import com.chinaweal.aiccs.aiccs.force.service.IXrForceNoticeService;
 import com.chinaweal.aiccs.aiccs.inspect.service.TSWorkNoService;
+import com.chinaweal.aiccs.aiccs.revoke.entity.BatchRevokePushRecord;
+import com.chinaweal.aiccs.aiccs.revoke.service.BatchRevokePushRecordService;
 import com.chinaweal.aiccs.aiccs.revoke.service.CreateFileService;
 import com.chinaweal.aiccs.aiccs.seriousillegalPerson.common.emnu.AuthEnum;
 import com.chinaweal.aiccs.aiccs.system.entity.TRBaseCode;
@@ -87,6 +89,8 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
     private CreateFileService createFileService;
     @Autowired
     private IGzaiccodeService gzaiccodeService;
+    @Resource
+    private BatchRevokePushRecordService batchRevokePushRecordService;
 
     private static final ExpiryMap<String, Collection<?>> EXPIRY_MAP = new ExpiryMap<>(15 * 60);
 
@@ -608,6 +612,28 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
         // 2026年2月4日 生成pdf文书
         createFileService.createPdfCommon(xrForceSpe.getBizSeqNo(), "决定书送达公告", "强制注销决定送达公告",
                 "force", ".pdf", "/static/template/commonWritTemplate.docx", data);
+
+        // 写入推送记录存储表，后续定时任务统一推送
+        EBaseinfo eBaseinfo = iEBaseinfoService.getById(xrForceSpe.getPripId());
+        LocalDateTime nowTime = LocalDateTime.now();
+        BatchRevokePushRecord pushRecord = new BatchRevokePushRecord();
+        pushRecord.setRevlistid(xrForceSpe.getForceSpeId());
+        pushRecord.setPripid(xrForceSpe.getPripId());
+        pushRecord.setUniscid(eBaseinfo != null ? eBaseinfo.getUniscid() : xrForceSpe.getUniscId());
+        pushRecord.setEntname(eBaseinfo != null ? eBaseinfo.getEntname() : xrForceSpe.getEntName());
+        pushRecord.setRevokeRea(xrForceSpe.getForceRra());
+        pushRecord.setRevokedate(nowTime);
+        pushRecord.setPunishOrg(xrForceSpe.getRegOrg());
+        pushRecord.setPunishOrgCn(xrForceSpe.getRegOrgCn());
+        pushRecord.setHandlerid(user.getPrimaryKey());
+        pushRecord.setHandlername(user.getName());
+        pushRecord.setPushStatus("0"); // 0-待推送
+        pushRecord.setPushCount(0);
+        pushRecord.setCreateTime(nowTime);
+        pushRecord.setUpdateTime(nowTime);
+        pushRecord.setBiztype("1"); // 强制注销类型
+        batchRevokePushRecordService.save(pushRecord);
+
         return xrForceSpe;
     }
 
diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/revoke/entity/BatchRevokePushRecord.java b/src/main/java/com/chinaweal/aiccs/aiccs/revoke/entity/BatchRevokePushRecord.java
index 17017ca..a475074 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/revoke/entity/BatchRevokePushRecord.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/revoke/entity/BatchRevokePushRecord.java
@@ -13,11 +13,11 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 批量吊销推送记录表
+ * 批量吊销/注销推送记录表
  * 存储需要推送的批量吊销成功市场主体记录
  * </p>
  *
- * @author Lee
+ * @author lroyia
  * @since 2026-02-24
  */
 @Data
@@ -148,6 +148,12 @@ public class BatchRevokePushRecord extends Model<BatchRevokePushRecord> {
     @TableField("REMARK")
     private String remark;
 
+    /**
+     * 业务类型（0：批量吊销，1：强制注销）
+     */
+    @TableField("BIZTYPE")
+    private String biztype;
+
     @Override
     protected Serializable pkVal() {
         return this.id;
diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/revoke/service/impl/TsbizrevlistServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/revoke/service/impl/TsbizrevlistServiceImpl.java
index d81b5c4..1a498a8 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/revoke/service/impl/TsbizrevlistServiceImpl.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/revoke/service/impl/TsbizrevlistServiceImpl.java
@@ -450,6 +450,7 @@ public class TsbizrevlistServiceImpl extends BaseServiceImpl<TsbizrevlistMapper,
                     pushRecord.setPushCount(0);
                     pushRecord.setCreateTime(now);
                     pushRecord.setUpdateTime(now);
+                    pushRecord.setBiztype("0");
                     pushRecord.setRemark(dto.getRemark());
 
                     batchRevokePushRecordService.save(pushRecord);