|
@@ -1,5 +1,6 @@
|
|
|
package com.qmth.themis.business.bean.admin;
|
|
|
|
|
|
+import com.qmth.themis.business.enums.BreachCancelTypeEnum;
|
|
|
import com.qmth.themis.business.enums.BreachTypeEnum;
|
|
|
import io.swagger.annotations.ApiModel;
|
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
@@ -50,7 +51,13 @@ public class ExamBreachDetailListBean {
|
|
|
|
|
|
public String getType() {
|
|
|
if (Objects.nonNull(type)) {
|
|
|
- return BreachTypeEnum.valueOf(type).getCode();
|
|
|
+ if (Objects.nonNull(status) && Objects.equals("违纪处理", status)) {
|
|
|
+ return BreachTypeEnum.valueOf(type).getCode();
|
|
|
+ } else if (Objects.nonNull(status) && Objects.equals("撤销违纪", status)) {
|
|
|
+ return BreachCancelTypeEnum.valueOf(type).getCode();
|
|
|
+ } else {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
} else {
|
|
|
return type;
|
|
|
}
|