From 102756a5927d4e40f99a2e2824e25c73ce9c0f05 Mon Sep 17 00:00:00 2001
From: zhouxy <zhouxy@example.com>
Date: Tue, 5 May 2026 18:06:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=96=E7=9C=81=E8=A1=8C?=
 =?UTF-8?q?=E6=94=BF=E5=A4=84=E7=BD=9A=E7=9A=84=E6=96=87=E4=B9=A6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9B=E6=B7=BB=E5=8A=A0=E6=96=B0=E8=A1=A8=E8=AE=A9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83=E6=8A=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/QgCasePubNbaseinfoMapper.java      |  2 +
 .../service/IQgCasePubNbaseinfoService.java   |  2 +
 .../impl/IQgCasePubNbaseinfoServiceImpl.java  |  6 +++
 .../impl/TBizRemPunishmentServiceImpl.java    | 39 +++++++++++--------
 .../impl/TswrittemplateServiceImpl.java       | 29 ++++++++++----
 .../punishment/QgCasePubNbaseinfoMapper.xml   | 18 +++++++++
 6 files changed, 71 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/mapper/QgCasePubNbaseinfoMapper.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/mapper/QgCasePubNbaseinfoMapper.java
index 40ac2ab..4b48da3 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/mapper/QgCasePubNbaseinfoMapper.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/mapper/QgCasePubNbaseinfoMapper.java
@@ -43,4 +43,6 @@ public interface QgCasePubNbaseinfoMapper extends BaseMapper<QgCasePubNbaseinfo>
      * @return 更新行数
      */
     int updateForRepair(@Param("caseid") String caseid, @Param("approvalDate") LocalDate approvalDate, @Param("now") LocalDateTime now);
+
+    int insertQgCasePubNbaseinfoData(@Param("caseid") String caseid);
 }
diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/IQgCasePubNbaseinfoService.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/IQgCasePubNbaseinfoService.java
index f38457b..9cfad21 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/IQgCasePubNbaseinfoService.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/IQgCasePubNbaseinfoService.java
@@ -43,4 +43,6 @@ public interface IQgCasePubNbaseinfoService extends IService<QgCasePubNbaseinfo>
      * @return 是否成功
      */
     boolean updateForRepair(String caseid, LocalDate approvalDate);
+
+    boolean insertQgCasePubNbaseinfoData(String caseid);
 }
diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/IQgCasePubNbaseinfoServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/IQgCasePubNbaseinfoServiceImpl.java
index 291bdfc..a831530 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/IQgCasePubNbaseinfoServiceImpl.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/IQgCasePubNbaseinfoServiceImpl.java
@@ -38,4 +38,10 @@ public class IQgCasePubNbaseinfoServiceImpl extends ServiceImpl<QgCasePubNbasein
         int rows = this.baseMapper.updateForRepair(caseid, approvalDate, LocalDateTime.now());
         return rows > 0;
     }
+
+    @Override
+    public boolean insertQgCasePubNbaseinfoData(String caseid) {
+        int rows = this.baseMapper.insertQgCasePubNbaseinfoData(caseid);
+        return rows > 0;
+    }
 }
diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java
index 5446a6c..44b8fd8 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java
@@ -105,26 +105,29 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
         Map<String, String> resultMap = new HashMap<>();
         String entName = "";
 
-        // 先查本省表
         TbIlcPunInfoQuery tbIlcPunInfoQuery = tbIlcPunInfoQueryService.findById(tBizRemPunishment.getPunishmentId());
         if (tbIlcPunInfoQuery != null) {
-            // 本省案件
-            tBizRemPunishment.setSourceType("本省");
-            EBaseinfo eBaseInfo = eBaseInfoService.lambdaQuery().eq(EBaseinfo::getUniscid, tbIlcPunInfoQuery.getUniscid()).one();
-            tBizRemPunishment.setPripid(eBaseInfo.getPripid());
-            entName = eBaseInfo.getEntname();
-        } else {
-            // 查外省表
-            com.chinaweal.aiccs.aiccs.punishment.entity.QgCasePubNbaseinfo qgCasePubNbaseinfo =
-                    qgCasePubNbaseinfoService.findById(tBizRemPunishment.getPunishmentId());
-            if (qgCasePubNbaseinfo != null) {
-                // 外省案件
-                tBizRemPunishment.setSourceType("外省");
-                tBizRemPunishment.setPripid(qgCasePubNbaseinfo.getPripid());
-                entName = qgCasePubNbaseinfo.getEntname();
+            if (StringUtils.equals("本省",tbIlcPunInfoQuery.getSourceType())) {
+                // 本省案件
+                tBizRemPunishment.setSourceType("本省");
+                EBaseinfo eBaseInfo = eBaseInfoService.lambdaQuery().eq(EBaseinfo::getUniscid, tbIlcPunInfoQuery.getUniscid()).one();
+                tBizRemPunishment.setPripid(eBaseInfo.getPripid());
+                entName = eBaseInfo.getEntname();
             } else {
-                throw new RuntimeException("未找到对应的行政处罚记录");
+                // 查外省表
+                com.chinaweal.aiccs.aiccs.punishment.entity.QgCasePubNbaseinfo qgCasePubNbaseinfo =
+                        qgCasePubNbaseinfoService.findById(tBizRemPunishment.getPunishmentId());
+                if (qgCasePubNbaseinfo != null) {
+                    // 外省案件
+                    tBizRemPunishment.setSourceType("外省");
+                    tBizRemPunishment.setPripid(qgCasePubNbaseinfo.getPripid());
+                    entName = qgCasePubNbaseinfo.getEntname();
+                } else {
+                    throw new RuntimeException("未找到对应的行政处罚记录");
+                }
             }
+        } else {
+            throw new RuntimeException("未找到对应的行政处罚记录");
         }
 
         String bizSeq = IdUtil.simpleUUID();
@@ -383,7 +386,9 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
     private void insertCrECase(TBizRemPunishment tBizRemPunishment) {
         // 1. 更新跨省处罚表：opflag='D', pubdeadline=审批日期, S_EXT_DATETIME=审批日期
         LocalDateTime now = LocalDateTime.now();
-        qgCasePubNbaseinfoService.updateForRepair(tBizRemPunishment.getPunishmentId(), now.toLocalDate());
+//        qgCasePubNbaseinfoService.updateForRepair(tBizRemPunishment.getPunishmentId(), now.toLocalDate());
+        //插入表QG_CASE_PUB_NBASEINFO_DATA让数据中心定时抽数
+        qgCasePubNbaseinfoService.insertQgCasePubNbaseinfoData(tBizRemPunishment.getPunishmentId());
 
         // 2. 获取跨省处罚信息用于插入CR_E_CASE
         com.chinaweal.aiccs.aiccs.punishment.entity.QgCasePubNbaseinfo qgCasePubNbaseinfo = 
diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/writs/service/impl/TswrittemplateServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/writs/service/impl/TswrittemplateServiceImpl.java
index 7fb5202..79f0448 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/writs/service/impl/TswrittemplateServiceImpl.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/writs/service/impl/TswrittemplateServiceImpl.java
@@ -340,14 +340,27 @@ public class TswrittemplateServiceImpl extends BaseServiceImpl<TswrittemplateMap
 
 //                    String addr = ConstantsUtil.getAddr(regionId);
 //                    String phoneDW = ConstantsUtil.getPhone(regionId);
-                    String replaceContent = content.replace("{{party}}", StringUtils.isNotEmpty(eBaseinfo.getEntname()) ? eBaseinfo.getEntname() : StringUtils.EMPTY)
-                            .replace("{{entCerName}}", StringUtils.isNotEmpty(eBaseinfo.getEntname()) ? eBaseinfo.getEntname() : StringUtils.EMPTY)
-                            .replace("{{uniscid}}", StringUtils.isNotEmpty(eBaseinfo.getUniscid()) ? eBaseinfo.getUniscid() : StringUtils.EMPTY)
-                            .replace("{{dom}}", StringUtils.isNotEmpty(eBaseinfo.getDom()) ? eBaseinfo.getDom() : StringUtils.EMPTY)
-                            .replace("{{lerepname}}", StringUtils.isNotEmpty(eBaseinfo.getName()) ? eBaseinfo.getName() : StringUtils.EMPTY)
-                            .replace("{{cerNo}}", StringUtils.isNotEmpty(eBaseinfo.getCerno()) ? eBaseinfo.getCerno() : StringUtils.EMPTY)
-                            .replace("{{phone}}", StringUtils.isNotEmpty(eBaseinfo.getPhone()) ? eBaseinfo.getPhone() : StringUtils.EMPTY)
-                            .replace("{{otherContact}}", StringUtils.EMPTY)
+
+                    String replaceContent = "";
+                    if (eBaseinfo != null){
+                        replaceContent = content.replace("{{party}}", StringUtils.isNotEmpty(eBaseinfo.getEntname()) ? eBaseinfo.getEntname() : StringUtils.EMPTY)
+                                .replace("{{entCerName}}", StringUtils.isNotEmpty(eBaseinfo.getEntname()) ? eBaseinfo.getEntname() : StringUtils.EMPTY)
+                                .replace("{{uniscid}}", StringUtils.isNotEmpty(eBaseinfo.getUniscid()) ? eBaseinfo.getUniscid() : StringUtils.EMPTY)
+                                .replace("{{dom}}", StringUtils.isNotEmpty(eBaseinfo.getDom()) ? eBaseinfo.getDom() : StringUtils.EMPTY)
+                                .replace("{{lerepname}}", StringUtils.isNotEmpty(eBaseinfo.getName()) ? eBaseinfo.getName() : StringUtils.EMPTY)
+                                .replace("{{cerNo}}", StringUtils.isNotEmpty(eBaseinfo.getCerno()) ? eBaseinfo.getCerno() : StringUtils.EMPTY)
+                                .replace("{{phone}}", StringUtils.isNotEmpty(eBaseinfo.getPhone()) ? eBaseinfo.getPhone() : StringUtils.EMPTY);
+                    } else {
+                        replaceContent = content.replace("{{party}}", StringUtils.isNotEmpty(tbIlcPunInfoQuery.getDsrmc()) ? tbIlcPunInfoQuery.getDsrmc() : StringUtils.EMPTY)
+                                .replace("{{entCerName}}", StringUtils.isNotEmpty(tbIlcPunInfoQuery.getDsrmc()) ? tbIlcPunInfoQuery.getDsrmc() : StringUtils.EMPTY)
+                                .replace("{{uniscid}}", StringUtils.isNotEmpty(tbIlcPunInfoQuery.getUniscid()) ? tbIlcPunInfoQuery.getUniscid() : StringUtils.EMPTY)
+                                .replace("{{dom}}", StringUtils.EMPTY)
+                                .replace("{{lerepname}}", StringUtils.EMPTY)
+                                .replace("{{cerNo}}", StringUtils.EMPTY)
+                                .replace("{{phone}}", StringUtils.EMPTY);
+                    }
+
+                    replaceContent = replaceContent.replace("{{otherContact}}", StringUtils.EMPTY)
                             .replace("{{abntime}}", StringUtils.isNotEmpty(abntimeStr) ? abntimeStr : StringUtils.EMPTY)
                             .replace("{{applyTime}}", StringUtils.isNotEmpty(applyTimeStr) ? applyTimeStr : StringUtils.EMPTY)
                             .replace("{{acceptTime}}", StringUtils.isNotEmpty(acceptTimeStr) ? acceptTimeStr : StringUtils.EMPTY)
diff --git a/src/main/resources/mybatis/mapper/aiccs/punishment/QgCasePubNbaseinfoMapper.xml b/src/main/resources/mybatis/mapper/aiccs/punishment/QgCasePubNbaseinfoMapper.xml
index b430fc2..32bad5f 100644
--- a/src/main/resources/mybatis/mapper/aiccs/punishment/QgCasePubNbaseinfoMapper.xml
+++ b/src/main/resources/mybatis/mapper/aiccs/punishment/QgCasePubNbaseinfoMapper.xml
@@ -96,4 +96,22 @@
         WHERE CASEID = #{caseid}
     </update>
 
+    <insert id="insertQgCasePubNbaseinfoData">
+        INSERT INTO QG_CASE_PUB_NBASEINFO_DATA (
+            CASEID, ACTYPE, PRIPID, ENTNAME, UNISCID, REGNO, INSCERCODE, SOCORGCODE, ORGCODE, TAXID,
+            LEREP, CERTYPE, CERNO, NAME, AC_CERTYPE, AC_CERNO, PENDECNO, ILLEGACTTYPECODE, ILLEGACTTYPE,
+            MAINILLEGFACT, PENBASIS, PENBASIS_CN, PENTYPE, PENTYPE_CN, PENAM, FORFAM, PENDECISSDATE,
+            PENPERI, PENAUTH, PENAUTH_CN, PENAUTHUNISCID, PENCONTENT, REVLICNUM, PUBLICDATE, PUBDEADLINE,
+            DATADEPT, DATADEPTUNISCID, REMARK, OPFLAG, S_EXT_DATETIME, LASTUPDATETIME
+        )
+        SELECT
+            CASEID, ACTYPE, PRIPID, ENTNAME, UNISCID, REGNO, INSCERCODE, SOCORGCODE, ORGCODE, TAXID,
+            LEREP, CERTYPE, CERNO, NAME, AC_CERTYPE, AC_CERNO, PENDECNO, ILLEGACTTYPECODE, ILLEGACTTYPE,
+            MAINILLEGFACT, PENBASIS, PENBASIS_CN, PENTYPE, PENTYPE_CN, PENAM, FORFAM, PENDECISSDATE,
+            PENPERI, PENAUTH, PENAUTH_CN, PENAUTHUNISCID, PENCONTENT, REVLICNUM, PUBLICDATE, SYSDATE(),
+            DATADEPT, DATADEPTUNISCID, REMARK, 'D', SYSDATE(), LASTUPDATETIME
+        FROM QG_CASE_PUB_NBASEINFO
+        WHERE CASEID = #{caseid}
+    </insert>
+
 </mapper>