From bba9d9bd7bbebbdfda231c2edb1d339cec54cd03 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 16 六月 2025 10:42:46 +0800
Subject: [PATCH] 补充机床接口2
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml
index c3836a5..e5da9df 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml
@@ -9,13 +9,13 @@
<result column="name" property="name"/>
<result column="status" property="status"/>
- <result column="createTime" property="create_time"/>
- <result column="updateTime" property="update_time"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_time" property="updateTime"/>
<result column="is_deleted" property="isDeleted"/>
</resultMap>
<select id="pageQuery" resultType="org.springblade.mdm.basesetting.machine.vo.MachineVO">
- select m.id,m.name,m.code,g.name group_name,m.machine_spec,m.manufacturer,m.operator
- from mdm_machine m join mdm_machine_group g on m.machine_group_id=g.id
+ select m.id,m.name,m.code,g.dict_key machine_group_code,g.dict_value machine_group_name,m.machine_spec,m.manufacturer,m.operator
+ from mdm_machine m join blade_dict_biz g on m.machine_group_code=g.dict_key and g.code='machine_group' and g.is_deleted=0
${ew.customSqlSegment}
</select>
--
Gitblit v1.9.3