From 6558f194df9c9e7ed3224fbdb6eb426cbce0657f Mon Sep 17 00:00:00 2001 From: cc_caijp <1049976610@qq.com> Date: Thu, 22 Jan 2026 09:18:30 +0800 Subject: [PATCH] fix --- .../aiccs/aiccs/expelled/entity/ExpelledEntInfo.java | 4 ++-- .../aiccs/aiccs/expelled/entity/ExpelledResultInfo.java | 4 ++-- .../com/chinaweal/aiccs/aiccs/expelled/vo/AuditInfoVo.java | 6 ++++++ .../mapper/aiccs/expelled/ExpelledAuditInfoMapper.xml | 6 ++++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/expelled/entity/ExpelledEntInfo.java b/src/main/java/com/chinaweal/aiccs/aiccs/expelled/entity/ExpelledEntInfo.java index 6116b63..647c051 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/expelled/entity/ExpelledEntInfo.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/expelled/entity/ExpelledEntInfo.java @@ -72,9 +72,9 @@ public class ExpelledEntInfo extends SuperEntity implements Serializable { private LocalDate sendTime; /** - * 当前状态:0-有效,1-异议中,2-决定中,3-已异议,4-已决定,5-异议不通过,6-决定不通过 + * 当前状态:-1-除名告知不通过,0-有效,1-异议中,2-决定中,3-已异议,4-已决定,5-异议不通过,6-决定不通过 */ - @ApiModelProperty(value = "当前状态:0-有效,1-异议中,2-决定中,3-已异议,4-已决定,5-异议不通过,6-决定不通过") + @ApiModelProperty(value = "当前状态:-1-除名告知不通过,0-有效,1-异议中,2-决定中,3-已异议,4-已决定,5-异议不通过,6-决定不通过") @TableField(value = "STATUS") private String status; } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/expelled/entity/ExpelledResultInfo.java b/src/main/java/com/chinaweal/aiccs/aiccs/expelled/entity/ExpelledResultInfo.java index 3bb7029..06970a2 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/expelled/entity/ExpelledResultInfo.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/expelled/entity/ExpelledResultInfo.java @@ -78,9 +78,9 @@ public class ExpelledResultInfo extends SuperEntity implements Serializable { private String auditOpinion; /** - * 状态:10-有效,11-修复中,12-复议中,13-撤销中,91-修复完成,92-复议通过被动撤销完成,93-主动撤销完成 + * 状态:-1-除名异议不通过,-2-除名决定不通过,10-有效,11-修复中,12-复议中,13-撤销中,91-修复完成,92-复议通过被动撤销完成,93-主动撤销完成 */ - @ApiModelProperty(value = "状态:10-有效,11-修复中,12-复议中,13-撤销中,91-修复完成,92-复议通过被动撤销完成,93-主动撤销完成") + @ApiModelProperty(value = "状态:-1-除名异议不通过,-2-除名决定不通过,10-有效,11-修复中,12-复议中,13-撤销中,91-修复完成,92-复议通过被动撤销完成,93-主动撤销完成") @TableField(value = "STATE") private String state; } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/expelled/vo/AuditInfoVo.java b/src/main/java/com/chinaweal/aiccs/aiccs/expelled/vo/AuditInfoVo.java index 3a19123..8e72d0c 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/expelled/vo/AuditInfoVo.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/expelled/vo/AuditInfoVo.java @@ -167,4 +167,10 @@ public class AuditInfoVo implements Serializable { @ApiModelProperty(value = "业务名称") @TableField(exist = false) private String busName; + + /** + * 状态:10-有效,11-修复中,12-复议中,13-撤销中,91-修复完成,92-复议通过被动撤销完成,93-主动撤销完成 + */ + @ApiModelProperty(value = "状态:10-有效,11-修复中,12-复议中,13-撤销中,91-修复完成,92-复议通过被动撤销完成,93-主动撤销完成") + private List states; } diff --git a/src/main/resources/mybatis/mapper/aiccs/expelled/ExpelledAuditInfoMapper.xml b/src/main/resources/mybatis/mapper/aiccs/expelled/ExpelledAuditInfoMapper.xml index 65ac3ae..fe61bb4 100644 --- a/src/main/resources/mybatis/mapper/aiccs/expelled/ExpelledAuditInfoMapper.xml +++ b/src/main/resources/mybatis/mapper/aiccs/expelled/ExpelledAuditInfoMapper.xml @@ -45,6 +45,12 @@ AND r.STATE = #{map.state} + + AND r.STATE IN + + #{item} + +