From 7b9c994a8678e0aaf86638d7426f183ad7a175a5 Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期四, 07 八月 2025 10:03:15 +0800 Subject: [PATCH] yys 修改bug 1.“待审核”状态不能进行筛选 2.不能凭供应商名称/合同号进行筛选 3.不能凭供应商名称进行筛选 --- src/main/resources/mapper/device/DeviceMaintenanceMapper.xml | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml index 0cf426a..468198e 100644 --- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml +++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml @@ -25,12 +25,22 @@ left join device_ledger dl on dm.device_ledger_id = dl.id left join sys_user su on dm.create_user = su.user_id <where> + 1 = 1 <if test="deviceMaintenanceDto.deviceName != null"> and dl.device_name like concat('%',#{deviceMaintenanceDto.deviceName},'%') </if> <if test="deviceMaintenanceDto.deviceModel != null"> and dl.device_model like concat('%',#{deviceMaintenanceDto.deviceModel},'%') </if> + <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> + <if test="deviceMaintenanceDto.maintenanceActuallyTimeReq != null"> + and dm.maintenance_actually_time like concat('%',#{deviceMaintenanceDto.maintenanceActuallyTimeReq},'%') + </if> </where> </select> <select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto"> -- Gitblit v1.9.3