From 552944268d5c1fccb2b47c2f6ee41ebac719da31 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 12 八月 2025 17:25:24 +0800
Subject: [PATCH] 修改接口文档
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml
index a418734..cdb356a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml
@@ -12,9 +12,8 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
<select id="pageQuery" resultType="org.springblade.mdm.machineback.vo.MachineBackFileVO">
- select f.id,p.name program_name,p.is_cured,f.create_time,m.code machine_code, m.name machine_name,f.create_time arrived_time
- from mdm_machine_back_file f join mdm_machine m on f.machine_code=m.code
- left join mdm_nc_program p on f.program_id=p.id
+ select f.id,concat('xxx',f.id) name,1 as is_cured,f.create_time,'a' machine_code, f.create_time arrived_time
+ from mdm_machine_back_file f
<where>
f.status=1 and f.is_deleted=0
@@ -23,8 +22,8 @@
</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},'%')
- or p.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
- )
+
+ )
</if>
</where>
</select>
@@ -32,8 +31,9 @@
<!--鏈哄簥鍥炰紶绋嬪簭澶勭悊鍒嗛〉-->
<select id="handlePageQuery" resultType="org.springblade.mdm.machineback.vo.MachineBackFileVO">
select f.id,p.name name,p.code,p.is_cured,f.create_time,m.code machine_code, m.name machine_name,f.create_time arrived_time
- from mdm_machine_back_file f join mdm_machine m on f.machine_code=m.code
- left join mdm_nc_program p on f.program_id=p.id
+ from mdm_machine_back_file f
+ left join mdm_nc_program p on f.nc_program_id=p.id
+ left join mdm_machine m on p.machine_code=m.code
<where>
f.status=2 and f.is_deleted=0
--
Gitblit v1.9.3