From d1ab94084e68263e2261d1ddb027898d709c58e5 Mon Sep 17 00:00:00 2001
From: zhangchenbiao <chenbiao.zhang@coolcollege.cn>
Date: Tue, 19 Mar 2024 18:04:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=A2=E8=B0=88/=E9=9D=A2=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cool/store/enums/WorkflowStatusEnum.java  | 51 -------------------
 .../dto/interview/LineInterviewPageDTO.java   |  3 ++
 .../vo/interview/LineInterviewPageVO.java     |  4 ++
 .../store/config/TokenValidateFilter.java     |  2 +-
 4 files changed, 8 insertions(+), 52 deletions(-)
 delete mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java

diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java
deleted file mode 100644
index 9389e8939..000000000
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.cool.store.enums;
-
-/**
- * @Author suzhuhong
- * @Date 2023/6/9 16:35
- * @Version 1.0
- */
-public enum WorkflowStatusEnum {
-    //意向申请阶段
-    INTENT_0("0","待提交"),
-    INTENT_1("1","待审核"),
-    INTENT_2("2","已通过"),
-    INTENT_3("3","未通过"),
-
-    //预约面试阶段
-    RESERVATION_0("0","待预约"),
-    RESERVATION_1("1","待审核"),
-    RESERVATION_7("7","拒绝"),
-    RESERVATION_8("8","超时"),//超时未预约或未参加
-
-
-    //合格资格面试
-    INTERVIEW_2("2","待面试"),
-    INTERVIEW_3("3","已开始"),
-    INTERVIEW_4("4","待审核"),
-    INTERVIEW_5("5","审核中"),
-    INTERVIEW_6("6","审核通过"),
-    INTERVIEW_7("7","拒绝"),
-
-
-    ;
-
-    private String code;
-
-    private String message;
-
-    WorkflowStatusEnum(String code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/interview/LineInterviewPageDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/interview/LineInterviewPageDTO.java
index a29fa39d0..a3600b493 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/interview/LineInterviewPageDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/interview/LineInterviewPageDTO.java
@@ -51,4 +51,7 @@ public class LineInterviewPageDTO {
     @ApiModelProperty("面审人")
     private String interviewer;
 
+    @ApiModelProperty("房间id")
+    private String roomId;
+
 }
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/LineInterviewPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/LineInterviewPageVO.java
index 12e597220..dc89a6f26 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/LineInterviewPageVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/LineInterviewPageVO.java
@@ -60,6 +60,9 @@ public class LineInterviewPageVO {
     @ApiModelProperty("面审人")
     private String interviewerUsername;
 
+    @ApiModelProperty("房间id")
+    private String roomId;
+
     public static List<LineInterviewPageVO> convertList(List<LineInterviewPageDTO> list, Map<Long, String> userPortraitMap, Map<String, String> userNameMap, Map<Long, String> cityNameMap){
         if(CollectionUtils.isEmpty(list)){
             return Lists.newArrayList();
@@ -93,6 +96,7 @@ public class LineInterviewPageVO {
                 }
                 result.setUserPortraitList(userPortraitList);
             }
+            result.setRoomId(lineInterviewPage.getRoomId());
             resultList.add(result);
         }
         return resultList;
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java
index 1ab22caa8..1cbbb37b7 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java
@@ -126,7 +126,7 @@ public class TokenValidateFilter implements Filter {
 //            CurrentUserHolder.removeUser();
 //            MDC.clear();
 //        }
-        filterChain.doFilter(servletRequest, servletResponse);
+        //filterChain.doFilter(servletRequest, servletResponse);
     }
 
     @Override