From ee0c27cf30140d50b91fe4e08fa48052e910fd1f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 29 七月 2025 19:04:19 +0800
Subject: [PATCH] 机床类型去掉枚举
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 f79a3a9..dcc1f4f 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,14 +9,21 @@
<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.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 m.id,m.name,m.code,g.dict_key machine_group_code,g.dict_value machine_group_name,m.machine_spec,msp.dict_value machine_spec_name ,m.manufacturer,m.operator,m.status
+ from mdm_machine m left join blade_dict_biz g on m.machine_group_code=g.dict_key and g.code='machine_group' and g.is_deleted=0
+ left join blade_dict_biz msp on m.machine_spec=msp.dict_key and msp.code='machine_spec' and msp.is_deleted=0
+ where m.is_deleted=0
+ <if test="query.machineGroupCode!=null and query.machineGroupCode!=''">
+ and m.machine_group_code=#{query.machineGroupCode,jdbcType=VARCHAR}
+ </if>
+ <if test="query.keyword!=null and query.keyword!=''">
+ and (m.code like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%') or m.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%'))
+ </if>
</select>
--
Gitblit v1.9.3