Merge branch 'master' of http://47.107.61.133:3000/nm-project/aiccs-api

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 {

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;
+
 }

src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml

@@ -95,7 +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 '外省' as sourceType ,<include refid="As_Base_Column_List"/> from AICCS.QG_CASE_PUB_NBASEINFO where ACTYPE = '1' and CASEID = #{id}
     </select>
 
     <!-- 行政处罚记录UNION查询（本省+外省） -->