diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/InterviewTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/InterviewTypeEnum.java
index 8ca7b4173..2fe72d9e1 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/InterviewTypeEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/InterviewTypeEnum.java
@@ -1,7 +1,6 @@
package com.cool.store.enums;
import com.cool.store.constants.CommonConstants;
-import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.tuple.Pair;
import java.time.LocalDate;
@@ -9,7 +8,6 @@ import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
/**
* @author zhangchenbiao
@@ -93,8 +91,4 @@ public enum InterviewTypeEnum {
return result;
}
- public static void main(String[] args) {
- System.out.println(getTimeSlots(LocalDate.now(), InterviewTypeEnum.INTERVIEW));
- }
-
}
diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/InterviewUserTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/InterviewUserTypeEnum.java
new file mode 100644
index 000000000..1572788c9
--- /dev/null
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/InterviewUserTypeEnum.java
@@ -0,0 +1,23 @@
+package com.cool.store.enums;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: InterviewUserTypeEnum
+ * @Description:
+ * @date 2024-03-20 9:53
+ */
+public enum InterviewUserTypeEnum {
+
+ LINE("加盟商线索"),
+ INTERVIEWER("面试官"),;
+
+ private String message;
+
+ InterviewUserTypeEnum(String message) {
+ this.message = message;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+}
diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinInterviewStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinInterviewStatusEnum.java
new file mode 100644
index 000000000..a8c7bed47
--- /dev/null
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinInterviewStatusEnum.java
@@ -0,0 +1,45 @@
+package com.cool.store.enums;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: JoinInterviewStatusEnum
+ * @Description:
+ * @date 2024-03-20 11:05
+ */
+public enum JoinInterviewStatusEnum {
+
+ NO_JOIN(0, "未参加"),
+ LINE_JOIN(1,"加盟商先进入"),
+ INTERVIEW_JOIN(2,"面试官先进入"),
+ JOIN(3,"双方都参加");
+
+ private Integer code;
+
+ private String message;
+
+ JoinInterviewStatusEnum(Integer code, String message) {
+ this.code = code;
+ this.message = message;
+ }
+
+ public Integer getCode() {
+ return code;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public static Integer getJoinInterviewStatus(Integer joinInterviewStatus, InterviewUserTypeEnum userType){
+ if(NO_JOIN.getCode().equals(joinInterviewStatus)){
+ return InterviewUserTypeEnum.LINE.equals(userType) ? LINE_JOIN.getCode() : INTERVIEW_JOIN.getCode();
+ }
+ if(LINE_JOIN.getCode().equals(joinInterviewStatus)){
+ return InterviewUserTypeEnum.LINE.equals(userType) ? LINE_JOIN.getCode() : JOIN.getCode();
+ }
+ if(INTERVIEW_JOIN.getCode().equals(joinInterviewStatus)){
+ return InterviewUserTypeEnum.LINE.equals(userType) ? JOIN.getCode() : INTERVIEW_JOIN.getCode();
+ }
+ return JOIN.getCode();
+ }
+}
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-common/src/main/java/com/cool/store/utils/TRTCUtils.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/TRTCUtils.java
index e71b6cbd6..f90194b95 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/utils/TRTCUtils.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/TRTCUtils.java
@@ -16,10 +16,10 @@ public class TRTCUtils {
*/
private static final Long expired = 60 * 60 * 24L;
- @Value("${trtc.sdkAppId:null}")
+ @Value("${trtc.sdkAppId}")
private Long sdkAppId;
- @Value("${trtc.secretKey:null}")
+ @Value("${trtc.secretKey}")
private String key;
/**
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java
index ac6cc170f..c6168e02d 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java
@@ -23,7 +23,11 @@ public class LineInfoDAO {
public LineInfoDO getLineInfo(Long lineId) {
- return lineInfoMapper.selectByPrimaryKey(lineId);
+ LineInfoDO lineInfo = lineInfoMapper.selectByPrimaryKey(lineId);
+ if(Objects.nonNull(lineInfo) && !lineInfo.getDeleted()){
+ return lineInfo;
+ }
+ return null;
}
public Integer updateLineInfo(LineInfoDO param){
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInterviewDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInterviewDAO.java
index 6c148178e..71218573e 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInterviewDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInterviewDAO.java
@@ -51,4 +51,13 @@ public class LineInterviewDAO {
return lineInterviewMapper.getInterviewerPage(request);
}
+ /**
+ * 获取面试信息
+ * @param interviewId
+ * @return
+ */
+ public LineInterviewDO getInterviewInfoById(Long interviewId){
+ return lineInterviewMapper.selectByPrimaryKey(interviewId);
+ }
+
}
diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml
index 0a962590c..da115456f 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml
@@ -9,7 +9,7 @@
-
+
@@ -32,6 +32,7 @@