From 270aceade15ec4cb7715131055b53cec4ecb7d4e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 18:13:21 +0800
Subject: [PATCH] 增加现场编制查询列表
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/mapper/TaskDispatchStatMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/mapper/TaskDispatchStatMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/mapper/TaskDispatchStatMapper.xml
index 7d6c0f2..8625e54 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/mapper/TaskDispatchStatMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/mapper/TaskDispatchStatMapper.xml
@@ -3,11 +3,13 @@
<mapper namespace="org.springblade.mdm.statreport.mapper.TaskDispatchStatMapper">
<select id="pageQuery" resultType="org.springblade.mdm.statreport.vo.TaskDispatchStatVO">
- select t.drawing_no,t.process_no,t.process_edition,t.create_time,n.update_time cure_time
+ select t.id,t.drawing_no,t.process_no,t.process_edition,t.machine_code,t.create_time,n.update_time cure_time,
+ t.process_instance_id
from mdm_task_dispatch t
left join mdm_nc_node n
on t.drawing_no=n.drawing_no and t.process_no=n.process_no and t.process_edition=n.process_edition
- and n.is_deleted=0 and n.is_cured=1 and n.node_type='60'
+ and n.is_deleted=0 and n.is_cured=1 and n.node_type='60' and t.machine_code=n.machine_code
+ and n.is_last_edition=1
<where>
t.is_deleted=0 and t.status=2 and (t.deviation is null or t.deviation='')
<if test="query.drawingNo != null and query.drawingNo!=''">
@@ -21,6 +23,7 @@
and n.create_time<=#{query.createTimeEnd}
</if>
</where>
+ order by t.create_time desc
</select>
--
Gitblit v1.9.3