From 0cc92828383014e38b770427353d09f693c5ee9d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 27 四月 2026 13:26:16 +0800
Subject: [PATCH] fix(sales): 修复销售台账产品查询中供应商名称搜索条件重复问题
---
src/main/resources/mapper/device/DeviceMaintenanceMapper.xml | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 7046102..e08eae0 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -19,8 +19,11 @@
dm.tenant_id,
dm.maintenance_actually_name,
dl.device_name,
+ dm.machinery_category,
dl.device_model,
- su.nick_name as create_user_name
+ su.nick_name as create_user_name,
+ dm.maintenance_project,
+ dm.maintenance_content
from device_maintenance dm
left join device_ledger dl on dm.device_ledger_id = dl.id
left join sys_user su on dm.create_user = su.user_id
@@ -38,11 +41,11 @@
<if test="deviceMaintenanceDto.maintenanceActuallyName != null">
and dm.maintenance_actually_name like concat('%',#{deviceMaintenanceDto.maintenanceActuallyName},'%')
</if>
- <if test="deviceMaintenanceDto.maintenancePlanTimeReq != null">
- and dm.maintenance_plan_time like concat('%',#{deviceMaintenanceDto.maintenancePlanTimeReq},'%')
+ <if test="deviceMaintenanceDto.maintenancePlanTime != null">
+ and dm.maintenance_plan_time like concat('%',#{deviceMaintenanceDto.maintenancePlanTime},'%')
</if>
- <if test="deviceMaintenanceDto.maintenanceActuallyTimeReq != null">
- and dm.maintenance_actually_time like concat('%',#{deviceMaintenanceDto.maintenanceActuallyTimeReq},'%')
+ <if test="deviceMaintenanceDto.maintenanceActuallyTime != null">
+ and dm.maintenance_actually_time like concat('%',#{deviceMaintenanceDto.maintenanceActuallyTime},'%')
</if>
<if test="deviceMaintenanceDto.maintenanceActuallyTime != null">
and dm.maintenance_actually_time >= str_to_date(#{deviceMaintenanceDto.maintenanceActuallyTime}, '%Y-%m-%d')
@@ -62,10 +65,13 @@
dm.create_user,
dm.update_user,
dm.tenant_id,
+ dm.machinery_category,
dm.maintenance_actually_name,
dl.device_name,
dl.device_model,
- su.user_name as create_user_name
+ su.user_name as create_user_name,
+ dm.maintenance_project,
+ dm.maintenance_content
from device_maintenance dm
left join device_ledger dl on dm.device_ledger_id = dl.id
left join sys_user su on dm.create_user = su.user_id
--
Gitblit v1.9.3