From d06b51c149e42ff0ad59a7de2314382b4c1b943c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Fri, 12 Apr 2024 16:12:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=A2=E5=AE=A1=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/LineInfoMapper.xml          | 8 ++++----
 .../java/com/cool/store/service/impl/DeskServiceImpl.java | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
index a04964136..e8ff722d0 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
@@ -331,10 +331,10 @@
     select * from xfsg_line_info
     where  deleted = 0 and line_status = 1
     <if test="interviewType != null and interviewType == 1">
-      and first_interviewer = #{interviewId}
+      and investment_manager = #{interviewId}
     </if>
     <if test="interviewType != null and interviewType == 2">
-      and second_interviewer = #{interviewId}
+      and investment_manager = #{interviewId}
     </if>
     <if test="codes !=null and codes.size>0">
       <foreach collection="codes" item="code" open="and workflow_sub_stage_status in (" close=")" separator=",">
@@ -348,11 +348,11 @@
     SELECT
     sum( IF ( investment_manager = #{userId} AND workflow_sub_stage_status = 5, 1, 0 )  ) AS intendPendingCount,
     sum( IF ( investment_manager = #{userId} AND workflow_sub_stage_status = 20, 1, 0 ) ) AS interviewPendingCount,
-    sum( IF ( first_interviewer = #{userId} AND workflow_sub_stage_status IN ( 30, 35, 40 ), 1, 0 ) ) AS firstInterviewPendingCount,
+    sum( IF ( investment_manager = #{userId} AND workflow_sub_stage_status IN ( 30, 40 ), 1, 0 ) ) AS firstInterviewPendingCount,
     sum( IF ( investment_manager = #{userId} AND workflow_sub_stage_status = 50, 1, 0 ) ) AS payStagePendingCount,
     sum( IF ( investment_manager = #{userId} AND workflow_sub_stage_status IN ( 63, 70, 80 ), 1, 0 ) ) AS signingPendingCount,
     sum( IF ( investment_manager = #{userId} AND workflow_sub_stage_status IN ( 85, 90 ), 1, 0 ) ) AS storeExperiencePendingCount,
-    sum( IF ( second_interviewer = #{userId} AND workflow_sub_stage_status IN ( 105, 110, 115 ), 1, 0 ) ) AS secondInterviewPendingCount
+    sum( IF ( investment_manager = #{userId} AND workflow_sub_stage_status IN ( 105, 115 ), 1, 0 ) ) AS secondInterviewPendingCount
     FROM
     xfsg_line_info where deleted = 0 and line_status = 1
   </select>
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
index 8c5fd7261..68f6bbef8 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
@@ -99,8 +99,7 @@ public class DeskServiceImpl implements DeskService {
     public PageInfo<InterviewPendingVO> firstInterviewPendingList(Integer pageNum, Integer pageSize, LoginUserInfo userInfo) {
         PageHelper.startPage(pageNum, pageSize);
         List<LineInfoDO> lineInfoDOS = lineInfoDAO.listByInterview(userInfo.getUserId(),InterviewTypeEnum.INTERVIEW.getCode(),
-                        Arrays.asList(WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_35.getCode(),
-                                      WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_40.getCode(),
+                        Arrays.asList(WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_40.getCode(),
                                       WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_30.getCode()));
         PageInfo page = new PageInfo(lineInfoDOS);
         Map<Long, HyPartnerLabelDO> userPortraitMap = this.getUserPortraitMap(lineInfoDOS);
@@ -132,7 +131,6 @@ public class DeskServiceImpl implements DeskService {
         PageHelper.startPage(pageNum, pageSize);
         List<LineInfoDO> lineInfoDOS = lineInfoDAO.listByInterview(userInfo.getUserId(),InterviewTypeEnum.SECOND_INTERVIEW.getCode(),
                 Arrays.asList(WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_105.getCode(),
-                        WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_110.getCode(),
                         WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_115.getCode()));
         PageInfo page = new PageInfo(lineInfoDOS);
         Map<Long, HyPartnerLabelDO> userPortraitMap = this.getUserPortraitMap(lineInfoDOS);