From 22d0e9a68cd2f8a129742618e54d66cba7d7114f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 16 六月 2025 19:36:51 +0800
Subject: [PATCH] 修复机床回传文件分页
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.java | 2 +-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java | 15 ---------------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml | 9 ++++++++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml | 2 +-
4 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml
index 064c634..0feb647 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml
@@ -18,7 +18,7 @@
from mdm_machine m join blade_dict_biz g on m.machine_group_code=g.dict_key and g.code='machine_group' and g.is_deleted=0
where m.is_deleted=0
<if test="query.machineGroupCode!=null and query.machineGroupCode!=''">
- and m.machineGroupCode=#{query.keyword,jdbcType=VARCHAR}
+ and m.machine_group_code=#{query.machineGroupCode,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},'%'))
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.java
index 11e03a1..b593e2d 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.java
@@ -11,6 +11,6 @@
public interface MachineBackFileMapper extends BladeMapper<MachineBackFile> {
- IPage<MachineBackFileVO> pageQuery(IPage<MachineBackFile> page, @Param("queryVO")MachineBackFileQueryVO queryVO);
+ IPage<MachineBackFileVO> pageQuery(IPage<MachineBackFile> page, @Param("query")MachineBackFileQueryVO queryVO);
//pageMachine
}
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 99aa24b..b95dd1d 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
@@ -14,7 +14,14 @@
<select id="pageQuery" resultType="org.springblade.mdm.machineback.vo.MachineBackFileVO">
select f.id,f.filename,f.create_time,m.code machineCode,m.name machineName
from mdm_machine_back_file f join mdm_machine m on f.machine_code=m.code
- ${ew.customSqlSegment}
+ <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 f.filename like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
+ )
+ </if>
</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 06680bc..2a076f8 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
@@ -50,29 +50,14 @@
}
-
-
-
/**
* 鏌ヨ鍒嗛〉
* @param query 鏌ヨ鍙傛暟
* @return 鍒嗛〉鏁版嵁
*/
public IPage<MachineBackFileVO> pageQuery(MachineBackFileQueryVO query) {
-
- //LambdaQueryWrapper<Machine> queryWrapper = new LambdaQueryWrapper<>();
-
IPage<MachineBackFileVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),query);
- //MachineSpec.valueOf()
- /*
- for (MachineVO record : page.getRecords()) {
- if(record.getMachineSpec() != null){
- MachineSpec spec = MachineSpec.valueOf(record.getMachineSpec());
- record.setMachineSpecName(spec.getText());
- }
-
- }*/
return page;
}
}
--
Gitblit v1.9.3