From df1f128feb96f999f6b2fcbcae8eae72f584dbe5 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 04 六月 2026 15:55:24 +0800
Subject: [PATCH] 过程检、成品检报告需展示客户名称（生产订单对应带出来的），检测单位固定是 天津阳光彩印股份有限公司

---
 src/main/resources/mapper/device/DeviceRepairMapper.xml |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index d754e43..7970318 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -6,26 +6,79 @@
 <mapper namespace="com.ruoyi.device.mapper.DeviceRepairMapper">
 
     <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceRepairDto">
-        select dr.*,
+        select dr.id,
+               dr.device_ledger_id,
+                dr.repair_name,
+                dr.remark,
+                dr.repair_project,
+                dr.repair_time_start as repairTimeStart,
+                dr.repair_time_end as repairTimeEnd,
+                dr.maintenance_name,
+                dr.maintenance_time,
+                dr.maintenance_result,
+                dr.status,
+                dr.create_time,
+                dr.update_time,
+                dr.create_user,
+                dr.update_user,
+               dr.tenant_id,
                dl.device_name,
                dl.device_model
         from device_repair dr
         left join device_ledger dl on dr.device_ledger_id = dl.id
         <where>
+            1 = 1
             <if test="deviceRepairDto.deviceName != null">
                 and dl.device_name like concat('%',#{deviceRepairDto.deviceName},'%')
             </if>
             <if test="deviceRepairDto.deviceModel != null">
                 and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
             </if>
+            <if test="deviceRepairDto.status != null">
+                and dr.status = #{deviceRepairDto.status}
+            </if>
+            <if test="deviceRepairDto.remark != null">
+                and dr.remark like concat('%',#{deviceRepairDto.remark},'%')
+            </if>
+            <if test="deviceRepairDto.repairProject != null">
+                and dr.repair_project like concat('%',#{deviceRepairDto.repairProject},'%')
+            </if>
+            <if test="deviceRepairDto.maintenanceName != null">
+                and dr.maintenance_name like concat('%',#{deviceRepairDto.maintenanceName},'%')
+            </if>
+            <if test="deviceRepairDto.repairTimeStart != null">
+                and dr.repair_time_start &gt;= #{deviceRepairDto.repairTimeStart}
+            </if>
+            <if test="deviceRepairDto.repairTimeEnd != null">
+                and dr.repair_time_end &lt;= #{deviceRepairDto.repairTimeEnd}
+            </if>
+            <if test="deviceRepairDto.maintenanceTimeStr != null and deviceRepairDto.maintenanceTimeStr != '' ">
+                and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
+            </if>
         </where>
+        order by dr.status asc, dr.create_time desc
     </select>
     <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
-        select dr.*,
+        select dr.id,
+               dr.device_ledger_id,
+               dr.repair_name,
+               dr.remark,
+               dr.repair_project,
+               dr.repair_time_start as repairTimeStart,
+               dr.repair_time_end as repairTimeEnd,
+               dr.maintenance_name,
+               dr.maintenance_time,
+               dr.maintenance_result,
+               dr.status,
+               dr.create_time,
+               dr.update_time,
+               dr.create_user,
+               dr.update_user,
+               dr.tenant_id,
                dl.device_name,
                dl.device_model
         from device_repair dr
-        left join device_ledger dl on dr.device_ledger_id = dl.id
+                 left join device_ledger dl on dr.device_ledger_id = dl.id
         where dr.id = #{id}
     </select>
 

--
Gitblit v1.9.3