From 7b6741f6ccf11d0043ad94914d41a9bd23452d00 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 29 五月 2026 15:13:24 +0800
Subject: [PATCH] feat(sales): 添加销售台账审核反审功能 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