From f67161d150eb5720b28fd3f9fbb40c4145d1146c Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 10 六月 2026 11:42:37 +0800
Subject: [PATCH] feat:1.已审核只能编辑单价 2.添加完成按钮 3.添加标签打印和单据打印次数展示

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

diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index 6b6929a..5c73e4f 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -10,6 +10,9 @@
                dr.device_ledger_id,
                 dr.repair_time,
                 dr.repair_name,
+                dr.acceptance_name,
+                dr.acceptance_time,
+                dr.acceptance_remark,
                 dr.remark,
                 dr.maintenance_name,
                 dr.maintenance_time,
@@ -32,11 +35,21 @@
             <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.maintenanceName != null">
                 and dr.maintenance_name like concat('%',#{deviceRepairDto.maintenanceName},'%')
+            </if>
+
+            <if test="deviceRepairDto.repairTimeStr != null and deviceRepairDto.repairTimeStr != '' ">
+                and dr.repair_time like concat('%',#{deviceRepairDto.repairTimeStr},'%')
+            </if>
+            <if test="deviceRepairDto.maintenanceTimeStr != null and deviceRepairDto.maintenanceTimeStr != '' ">
+                and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
             </if>
         </where>
     </select>
@@ -45,6 +58,9 @@
                dr.device_ledger_id,
                dr.repair_time,
                dr.repair_name,
+               dr.acceptance_name,
+               dr.acceptance_time,
+               dr.acceptance_remark,
                dr.remark,
                dr.maintenance_name,
                dr.maintenance_time,

--
Gitblit v1.9.3