nm-project
/
aiccs-api
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
黎润豪 2026-04-28 10:47:19 +08:00
parent 0810c9481d 7e451c4470
commit 7cec2fdd2c
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java
View File

@ -204,7 +204,8 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
//文书模板数据转为文书正式数据 //文书模板数据转为文书正式数据
this.handleTsWrit(tBizRemPunishment, tswrittemplate); this.handleTsWrit(tBizRemPunishment, tswrittemplate);
//根据数据来源判断处理方式 //根据数据来源判断处理方式
if ("外省".equals(tBizRemPunishment.getSourceType())) { TbIlcPunInfoQuery tbIlcPunInfoQuery = tbIlcPunInfoQueryService.findById(tBizRemPunishment.getPunishmentId());
if ("外省".equals(tbIlcPunInfoQuery.getSourceType())) {
// 外省：更新QG表 + 插入CR_E_CASE // 外省：更新QG表 + 插入CR_E_CASE
this.insertCrECase(tBizRemPunishment); this.insertCrECase(tBizRemPunishment);
} else { } else {

9
src/main/java/com/chinaweal/aiccs/crgs/punish/entity/TbIlcPunInfoQuery.java
View File

@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable; import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -240,4 +242,11 @@ public class TbIlcPunInfoQuery extends Model<TbIlcPunInfoQuery> {
return this.id; return this.id;
} }
/**
* 数据来源标识 本省/外省
*/
@ApiModelProperty(value = "数据来源标识")
@TableField(exist = false)
private String sourceType;
} }

4
src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml
View File

@ -95,7 +95,9 @@
</select> </select>
<select id="findById" resultType="com.chinaweal.aiccs.crgs.punish.entity.TbIlcPunInfoQuery"> <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> </select>
<!-- 行政处罚记录UNION查询（本省+外省） --> <!-- 行政处罚记录UNION查询（本省+外省） -->