From 3baca21e0e6563f8379359ef2ba78c224eb4bc80 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 九月 2025 22:45:51 +0800
Subject: [PATCH] 修复审批表，确认表内容
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml
index 1e76ba2..b879b5a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml
@@ -13,16 +13,15 @@
<!--DNC鍥炰紶绋嬪簭澶勭悊鍒嗛〉-->
<select id="pageQuery" resultType="org.springblade.mdm.program.vo.DncBackFileVO">
- select f.id,n.name name,m.code machine_code, m.name machine_name,f.create_time
+ select f.id,n.name name,m.code machine_code, m.name machine_name,f.create_time,currnode.process_instance_id
from mdm_dnc_back_file f
- join mdm_nc_node n on f.nc_node_id=n.id
+ join mdm_nc_node_his n on f.nc_node_id=n.id
+ left join mdm_nc_node currnode on f.nc_node_id=currnode.id
left join mdm_machine m on n.machine_code=m.code
<where>
f.is_deleted=0
- <if test="query.machineSpec!=null and query.machineSpec!=''">
- and m.machine_spec=#{query.machineSpec,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},'%')
or n.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
@@ -35,6 +34,7 @@
and f.create_time <= #{query.createTimeEnd}
</if>
</where>
+ order by f.id desc
</select>
--
Gitblit v1.9.3