From fdf379044432536f3a451c77514822ab9cb19fba Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Wed, 22 Jan 2025 14:34:16 +0800
Subject: [PATCH] 1

---
 .../tickets/service/impl/DlRepairTicketsServiceImpl.java  | 1 +
 .../resources/mapper/tickets/DlRepairTicketsMapper.xml    | 8 ++++++++
 2 files changed, 9 insertions(+)

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 a2e0e704..bc250a7e 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
@@ -1093,6 +1093,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
 //            repairTicketsReqVO.setAdviserId(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
         } else if (userRoleCode.equals(RepairRoleEnum.REPAIR_STAFF.getCode())) {
             //维修工，进一步判断是否是班组长
+            //维修工，只查维修中、
             boolean ifLeader = repairWorkerService.getIfLeader();
             repairTicketsReqVO.setRoleCode(RepairRoleEnum.REPAIR_STAFF.getCode());
             if (ifLeader) {
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 97fcb593..c83290bc 100644
--- a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
+++ b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
@@ -246,6 +246,10 @@
             -- 按客户来源查，需要关联客户表 --
             left join base_customer_main bcm ON drt.user_id = bcm.id
         </if>
+        <if test="map.roleCode=='repair_staff'">
+            -- 维修工需要关联操作记录，查没有总检记录的工单 --
+            left join dl_repair_records drr ON drt.id = drr.ticket_id AND drr.type='zj'
+        </if>
         left join dl_repair_titem drti
         on drt.id = drti.ticket_id AND drti.deleted = '0'
         where (drt.deleted = '0') AND drt.tickets_status IN ('04','05','01','07','06','02')
@@ -268,6 +272,10 @@
         <if test="map.repairType !=null and map.repairType !=''">
             AND (drt.repair_type=#{map.repairType})
         </if>
+        <if test="map.roleCode=='repair_staff'">
+            -- 维修工需要关联操作记录，查没有总检记录的工单 --
+            AND (drr.id IS NULL)
+        </if>
         <if test="map.cusFrom != null and map.cusFrom!=''">
             <choose>
                 <when test="map.cusFrom == '06'">