From 78cc285f739d97d117dd2199649715529c40a199 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 04 六月 2025 15:03:13 +0800
Subject: [PATCH] 修改nacos配置
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml
similarity index 66%
copy from blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.xml
copy to blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml
index 814df02..c3836a5 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.mdm.basesetting.machine.mapper.MachineGroupMapper">
+<mapper namespace="org.springblade.mdm.basesetting.machine.mapper.MachineMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="org.springblade.mdm.basesetting.machine.entity.MachineGroup">
+ <resultMap id="BaseResultMap" type="org.springblade.mdm.basesetting.machine.entity.Machine">
<id column="id" property="id"/>
<result column="code" property="code"/>
<result column="name" property="name"/>
@@ -13,9 +13,14 @@
<result column="updateTime" property="update_time"/>
<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
+ ${ew.customSqlSegment}
+ </select>
-<!-- <select id="parentTree" resultMap="treeNodeResultMap">-->
+ <!-- <select id="parentTree" resultMap="treeNodeResultMap">-->
<!-- select id, parent_id, dict_value as title, id as "value", id as "key" from blade_dict where is_deleted = 0 and parent_id = 0-->
<!-- </select>-->
--
Gitblit v1.9.3