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

---
 .../resources/mapper/LineInterviewMapper.xml  |  6 +++++
 .../request/LineInterviewPageRequest.java     |  4 ++++
 .../store/service/LineInterviewService.java   | 11 +++-------
 .../impl/LineInterviewServiceImpl.java        | 22 ++++++++++++++-----
 .../webb/PCLineInterviewController.java       |  5 +++--
 5 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml
index ee269f3d5..063cbc45f 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml
@@ -86,6 +86,12 @@
     <if test="interviewerUserId != null and interviewerUserId != ''">
       and a.interviewer_user_id = #{interviewerUserId}
     </if>
+    <if test="wantShopAreaIds != null and wantShopAreaIds.size() > 0">
+      b.want_shop_area_id in
+      <foreach collection="wantShopAreaIds" item="item" separator="," open="(" close=")">
+        #{item}
+      </foreach>
+    </if>
   </select>
   
   <select id="getInterviewInfoByRoomId" resultMap="BaseResultMap">
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/LineInterviewPageRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/LineInterviewPageRequest.java
index d74470472..30c2cb831 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/LineInterviewPageRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/LineInterviewPageRequest.java
@@ -5,6 +5,8 @@ import com.cool.store.common.PageBasicInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author zhangchenbiao
  * @FileName: LineInterviewPageRequest
@@ -46,4 +48,6 @@ public class LineInterviewPageRequest extends PageBasicInfo {
 
     @ApiModelProperty("面试官")
     private String interviewerUserId;
+
+    private List<Long> wantShopAreaIds;
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LineInterviewService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LineInterviewService.java
index 2740e7558..f0dc37aac 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/LineInterviewService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/LineInterviewService.java
@@ -54,16 +54,11 @@ public interface LineInterviewService {
     /**
      * 获取分页
      * @param request
+     * @param userId
+     * @param isTeam
      * @return
      */
-    PageInfo<LineInterviewPageVO> getInterviewerPage(LineInterviewPageRequest request);
-
-    /**
-     * 获取团队线索
-     * @param request
-     * @return
-     */
-    PageInfo<LineInterviewPageVO> getTeamInterviewerPage(LineInterviewPageRequest request);
+    PageInfo<LineInterviewPageVO> getInterviewerPage(LineInterviewPageRequest request, String userId, Boolean isTeam);
 
     /**
      * 进入面试间
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java
index c22d0f1ef..03450e014 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java
@@ -14,6 +14,8 @@ import com.cool.store.exception.ServiceException;
 import com.cool.store.request.*;
 import com.cool.store.service.LabelService;
 import com.cool.store.service.LineInterviewService;
+import com.cool.store.service.SysRoleService;
+import com.cool.store.service.UserAuthMappingService;
 import com.cool.store.utils.TRTCUtils;
 import com.cool.store.utils.UUIDUtils;
 import com.cool.store.utils.poi.DateUtils;
@@ -22,6 +24,7 @@ import com.cool.store.vo.interview.*;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Value;
@@ -66,6 +69,10 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
     private LineAuditInfoDAO lineAuditInfoDAO;
     @Resource
     private CommonService commonService;
+    @Resource
+    private UserAuthMappingService userAuthMappingService;
+    @Resource
+    private SysRoleService sysRoleService;
 
     @Override
     public List<AppointmentTimeVO> getAppointmentTime(Long lineId, Integer interviewType, LocalDate appointmentDate) {
@@ -227,7 +234,15 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
     }
 
     @Override
-    public PageInfo<LineInterviewPageVO> getInterviewerPage(LineInterviewPageRequest request) {
+    public PageInfo<LineInterviewPageVO> getInterviewerPage(LineInterviewPageRequest request, String userId, Boolean isTeam) {
+        if(isTeam && !sysRoleService.checkIsAdmin(userId)){
+            List<Long> wantShopAreaIds = userAuthMappingService.listWantShopAreaIdByUserId(userId);
+            if(CollectionUtils.isEmpty(wantShopAreaIds)){
+                request.setInterviewerUserId(userId);
+            }else{
+                request.setWantShopAreaIds(wantShopAreaIds);
+            }
+        }
         Page<LineInterviewPageDTO> pageInfo = lineInterviewDAO.getInterviewerPage(request);
         List<String> userPortraitList  = pageInfo.stream().filter(x -> StringUtils.isNotEmpty(x.getUserPortrait() )).map(LineInterviewPageDTO::getUserPortrait).collect(Collectors.toList());
         List<String> investmentManagerUserIds = pageInfo.stream().filter(x -> StringUtils.isNotEmpty(x.getInvestmentManager() )).map(LineInterviewPageDTO::getInvestmentManager).collect(Collectors.toList());
@@ -243,11 +258,6 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
         return resultPage;
     }
 
-    @Override
-    public PageInfo<LineInterviewPageVO> getTeamInterviewerPage(LineInterviewPageRequest request) {
-        return null;
-    }
-
     @Override
     public EnterInterviewVO enterInterviewRoom(Long interviewId, String interviewUserId, InterviewUserTypeEnum userType) {
         LineInterviewDO interviewInfo = lineInterviewDAO.getInterviewInfoById(interviewId);
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCLineInterviewController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCLineInterviewController.java
index 2a5877859..36324525b 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCLineInterviewController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCLineInterviewController.java
@@ -67,13 +67,14 @@ public class PCLineInterviewController {
     @ApiOperation("一审列表/二审列表")
     @PostMapping("/page")
     public ResponseResult<PageInfo<LineInterviewPageVO>> getInterviewerPage(@RequestBody LineInterviewPageRequest request) {
-        return ResponseResult.success(lineInterviewService.getInterviewerPage(request));
+        request.setInterviewerUserId(CurrentUserHolder.getUserId());
+        return ResponseResult.success(lineInterviewService.getInterviewerPage(request, CurrentUserHolder.getUserId(), Boolean.FALSE));
     }
 
     @ApiOperation("团队一审/团队二审")
     @PostMapping("/team/page")
     public ResponseResult<PageInfo<LineInterviewPageVO>> getTeamInterviewerPage(@RequestBody LineInterviewPageRequest request) {
-        return ResponseResult.success(lineInterviewService.getTeamInterviewerPage(request));
+        return ResponseResult.success(lineInterviewService.getInterviewerPage(request, CurrentUserHolder.getUserId(), Boolean.TRUE));
     }
 
     @ApiOperation("获取面试信息")