wangliang 2 жил өмнө
parent
commit
f4ec01a52c

+ 8 - 1
themis-business/src/main/java/com/qmth/themis/business/bean/admin/ExamBreachDetailListBean.java

@@ -1,5 +1,6 @@
 package com.qmth.themis.business.bean.admin;
 package com.qmth.themis.business.bean.admin;
 
 
+import com.qmth.themis.business.enums.BreachCancelTypeEnum;
 import com.qmth.themis.business.enums.BreachTypeEnum;
 import com.qmth.themis.business.enums.BreachTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -50,7 +51,13 @@ public class ExamBreachDetailListBean {
 
 
     public String getType() {
     public String getType() {
         if (Objects.nonNull(type)) {
         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 {
         } else {
             return type;
             return type;
         }
         }