From af2ed4853b7bc3b60d54bd79fc1f30ba50b1b4c6 Mon Sep 17 00:00:00 2001
From: zhouxy <zhouxy@example.com>
Date: Mon, 27 Apr 2026 17:18:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=A4=84=E7=BD=9A?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=A6=E7=BB=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E5=8A=A0=E4=B8=8A=E5=A4=96=E7=9C=81=E7=9A=84?=
 =?UTF-8?q?=E8=A1=A8=E8=81=94=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml b/src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml
index ad83d77..08b34bc 100644
--- a/src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml
+++ b/src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml
@@ -96,6 +96,8 @@
 
     <select id="findById" resultType="com.chinaweal.aiccs.crgs.punish.entity.TbIlcPunInfoQuery">
         select <include refid="As_Base_Column_List"/> from case_pub_nbaseinfo where ACTYPE = '1' and CASEID = #{id}
+        union all
+        select <include refid="As_Base_Column_List"/> from AICCS.QG_CASE_PUB_NBASEINFO where ACTYPE = '1' and CASEID = #{id}
     </select>
 
     <!-- 行政处罚记录UNION查询（本省+外省） -->

From 7e451c4470d9789e13b562754399767245112d2e Mon Sep 17 00:00:00 2001
From: zhouxy <zhouxy@example.com>
Date: Mon, 27 Apr 2026 22:52:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=8C=E6=94=BF?=
 =?UTF-8?q?=E5=A4=84=E7=BD=9A=E4=BF=AE=E5=A4=8D=E5=AF=B9=E6=9C=AC=E7=9C=81?=
 =?UTF-8?q?=E5=A4=96=E7=9C=81=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TBizRemPunishmentServiceImpl.java       | 3 ++-
 .../aiccs/crgs/punish/entity/TbIlcPunInfoQuery.java      | 9 +++++++++
 .../mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml       | 4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)

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 670a7ff..5446a6c 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
@@ -204,7 +204,8 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
                     //文书模板数据转为文书正式数据
                     this.handleTsWrit(tBizRemPunishment, tswrittemplate);
                     //根据数据来源判断处理方式
-                    if ("外省".equals(tBizRemPunishment.getSourceType())) {
+                    TbIlcPunInfoQuery tbIlcPunInfoQuery = tbIlcPunInfoQueryService.findById(tBizRemPunishment.getPunishmentId());
+                    if ("外省".equals(tbIlcPunInfoQuery.getSourceType())) {
                         // 外省：更新QG表 + 插入CR_E_CASE
                         this.insertCrECase(tBizRemPunishment);
                     } else {
diff --git a/src/main/java/com/chinaweal/aiccs/crgs/punish/entity/TbIlcPunInfoQuery.java b/src/main/java/com/chinaweal/aiccs/crgs/punish/entity/TbIlcPunInfoQuery.java
index fe6d003..69ef913 100644
--- a/src/main/java/com/chinaweal/aiccs/crgs/punish/entity/TbIlcPunInfoQuery.java
+++ b/src/main/java/com/chinaweal/aiccs/crgs/punish/entity/TbIlcPunInfoQuery.java
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -240,4 +242,11 @@ public class TbIlcPunInfoQuery extends Model<TbIlcPunInfoQuery> {
         return this.id;
     }
 
+    /**
+     * 数据来源标识 本省/外省
+     */
+    @ApiModelProperty(value = "数据来源标识")
+    @TableField(exist = false)
+    private String sourceType;
+
 }
diff --git a/src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml b/src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml
index 08b34bc..338c19b 100644
--- a/src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml
+++ b/src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml
@@ -95,9 +95,9 @@
     </select>
 
     <select id="findById" resultType="com.chinaweal.aiccs.crgs.punish.entity.TbIlcPunInfoQuery">
-        select <include refid="As_Base_Column_List"/> from case_pub_nbaseinfo where ACTYPE = '1' and CASEID = #{id}
+        select '本省' as sourceType ,<include refid="As_Base_Column_List"/> from case_pub_nbaseinfo where ACTYPE = '1' and CASEID = #{id}
         union all
-        select <include refid="As_Base_Column_List"/> from AICCS.QG_CASE_PUB_NBASEINFO where ACTYPE = '1' and CASEID = #{id}
+        select '外省' as sourceType ,<include refid="As_Base_Column_List"/> from AICCS.QG_CASE_PUB_NBASEINFO where ACTYPE = '1' and CASEID = #{id}
     </select>
 
     <!-- 行政处罚记录UNION查询（本省+外省） -->