From 6c396bfbbd677172a91e30dae5dcfcad8ed3913b Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Thu, 14 Nov 2024 10:44:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=A1=BE=E9=97=AE=E4=B8=8D?=
 =?UTF-8?q?=E5=81=9A=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DlRepairTicketsServiceImpl.java |  7 ++++++-
 .../module/tickets/vo/DlRepairTicketsReqVO.java  |  3 +++
 .../mapper/tickets/DlRepairTicketsMapper.xml     | 16 +++++++++++++---
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
index 0e9bec98..38c0080e 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
@@ -8,6 +8,7 @@ import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.module.base.entity.RepairWorker;
 import cn.iocoder.yudao.module.base.service.RepairRecordsService;
 import cn.iocoder.yudao.module.base.service.RepairWorkerService;
@@ -1246,7 +1247,11 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
         repairTicketsReqVO.setSelectType("special");
         // 维修服务顾问
         if (userRoleCode.equals(RepairRoleEnum.ADVISOR.getCode())) {
-            repairTicketsReqVO.setNowRepairId(loginUserId);
+            // 查所有的服务顾问
+            List<UserDTO> userDTOS = roleApi.selectUserListByRoleCode(TenantContextHolder.getRequiredTenantId(), RepairRoleEnum.ADVISOR.getCode());
+            List<Long> ids = userDTOS.stream().map(UserDTO::getId).collect(Collectors.toList());
+            repairTicketsReqVO.setNowRepairIds(ids);
+//            repairTicketsReqVO.setNowRepairId(loginUserId);
             // 因为完成状态需要在交车之后，所以注掉这个
 //            repairTicketsReqVO.setIsFinish("1");
         } else if (userRoleCode.equals(RepairRoleEnum.INSPECTION.getCode())) {
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsReqVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsReqVO.java
index 0fa15d2b..fa86bc84 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsReqVO.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsReqVO.java
@@ -36,4 +36,7 @@ public class DlRepairTicketsReqVO extends DlRepairTickets {
 
     /** 图片路径 */
     private String image;
+
+    /** 当前操作人包含集合，主要用在服务顾问那儿 */
+    private List<Long> nowRepairIds;
 }
diff --git a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
index ab9ede97..742779d9 100644
--- a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
+++ b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
@@ -235,13 +235,23 @@
         </if>
         <choose>
             <when test="map.selectType=='special'">
-                -- 小李用的逻辑 --
-                <if test="map.isFinish != null and map.isFinish != ''">
+                -- 小李用的逻辑--isFinish不需要了 --
+                <!-- <if test="map.isFinish != null and map.isFinish != ''">
                     AND ( drt.is_finish = #{map.isFinish})
-                </if>
+                </if> -->
+                -- 总检查待处理还是用这个 --
                 <if test="map.nowRepairId != null and map.nowRepairId != ''">
                     AND ( drt.now_repair_id = #{map.nowRepairId})
                 </if>
+                -- 服务顾问查待处理（服务顾问之间可以相互查） --
+                <if test="map.nowRepairIds != null and map.nowRepairIds.size > 0">
+                    AND  (
+                        drt.now_repair_id in
+                        <foreach collection="map.nowRepairIds" item="id" open="(" separator="," close=")">
+                            #{id}
+                        </foreach>
+                        )
+                </if>
             </when>
             <otherwise>
                 -- 正常查询用的逻辑 --