From edd4eb1d5eed4085bbe80cb65116fe585a13c42f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 23 六月 2025 22:49:34 +0800
Subject: [PATCH] dnc导入完善
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
index 2c46bf8..719d903 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.micrometer.common.util.StringUtils;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.BeanUtil;
@@ -38,6 +39,7 @@
Machine machine = this.getById(vo.getId());
machine.setMachineSpec(vo.getMachineSpec());
+ machine.setCode(vo.getCode());
machine.setName(vo.getName());
machine.setMachineGroupCode(vo.getMachineGroupCode());
machine.setManufacturer(vo.getManufacturer());
@@ -64,8 +66,11 @@
public IPage<MachineVO> pageQuery(MachineQueryVO query) {
LambdaQueryWrapper<Machine> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(query.getMachineGroupCode()!=null, Machine::getMachineGroupCode, query.getMachineGroupCode());
- IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),queryWrapper);
+ //queryWrapper.eq(query.getMachineGroupCode()!=null, Machine::getMachineGroupCode, query.getMachineGroupCode());
+ //String keys = query.getKeyword();
+
+ //queryWrapper.and(StringUtils.isNotEmpty(keys), wrapper -> wrapper.like(Machine::getCode, keys).or().like(Machine::getName, keys));
+ IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),query);
//MachineSpec.valueOf()
for (MachineVO record : page.getRecords()) {
@@ -140,7 +145,6 @@
* @return
*/
public Machine getByCode(String machineCode) {
-
- return this.getOne(this.lambdaQuery().eq(Machine::getCode, machineCode));
+ return this.lambdaQuery().eq(Machine::getCode, machineCode).one();
}
}
--
Gitblit v1.9.3