From 09474c2fbb6d261585d1f366e37e85edd6b35065 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 20 六月 2025 20:21:15 +0800
Subject: [PATCH] 机床回传程序处理查询修改
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java | 5 +++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml | 12 ++++++------
2 files changed, 11 insertions(+), 6 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 237080f..0b80fa1 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
@@ -28,6 +28,8 @@
</if>
</where>
</select>
+
+ <!--鏈哄簥鍥炰紶绋嬪簭澶勭悊鍒嗛〉-->
<select id="handlePageQuery" 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
@@ -35,13 +37,11 @@
<where>
f.status=2 and f.is_deleted=0
- <if test="query.machineSpec!=null and query.machineSpec!=''">
- and m.machine_spec=#{query.machineSpec,jdbcType=VARCHAR}
+ <if test="query.confirmTimeBegin!=null">
+ and m.confirm_time$gt;=#{query.confirmTimeBegin}
</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 test="query.confirmTimeEnd!=null">
+ and m.confirm_time$lt;#{query.confirmTimeEnd}
</if>
</where>
</select>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java
index 593a510..2019645 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java
@@ -63,6 +63,11 @@
return page;
}
+ /**
+ * 鏈哄簥鍥炰紶绋嬪簭澶勭悊鍒嗛〉鏌ヨ
+ * @param query 鏌ヨ鍙傛暟瀵硅薄
+ * @return 鍒嗛〉鏁版嵁
+ */
public IPage<MachineBackFileVO> handlePageQuery(MachineBackFileHandleQueryVO query) {
IPage<MachineBackFileVO> page = this.getBaseMapper().handlePageQuery(Condition.getPage(query),query);
return page;
--
Gitblit v1.9.3