From 96088fcd74bfdcb9480da073eef0f04cb67ae954 Mon Sep 17 00:00:00 2001 From: xiaofajia <1665375861@qq.com> Date: Sat, 12 Oct 2024 12:30:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=8C=87=E6=B4=BE=E5=A4=9A?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/iocoder/yudao/module/tickets/entity/DlRepairTitem.java | 4 ++-- .../src/main/resources/mapper/base/RepairWorkerMapper.xml | 2 +- .../src/main/resources/mapper/tickets/DlRepairTitemMapper.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/entity/DlRepairTitem.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/entity/DlRepairTitem.java index 67f175be..b00c5337 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/entity/DlRepairTitem.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/entity/DlRepairTitem.java @@ -64,12 +64,12 @@ public class DlRepairTitem extends TenantBaseDO { /** * 维修人员ID(system_users表的ID) */ - private Long repairId; + private String repairIds; /** * 维修人员名字(company_staff表的name) */ - private String repairName; + private String repairNames; /** * 销售人员ID(system_users表的ID) diff --git a/dl-module-repair/src/main/resources/mapper/base/RepairWorkerMapper.xml b/dl-module-repair/src/main/resources/mapper/base/RepairWorkerMapper.xml index 3b2e9228..c51f3010 100644 --- a/dl-module-repair/src/main/resources/mapper/base/RepairWorkerMapper.xml +++ b/dl-module-repair/src/main/resources/mapper/base/RepairWorkerMapper.xml @@ -19,7 +19,7 @@ main.deleted = 0 - and main.user_name = #{entity.userName} + and main.user_name like concat('%', #{entity.userName}, '%') and main.work_type = #{entity.workType} diff --git a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTitemMapper.xml b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTitemMapper.xml index ebdfd86f..f281ac69 100644 --- a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTitemMapper.xml +++ b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTitemMapper.xml @@ -12,8 +12,8 @@ drti.item_price, drti.item_discount, drti.item_money, - drti.repair_id, - drti.repair_name, + drti.repair_ids, + drti.repair_names, drti.sale_id, drti.sale_name, drti.item_type,