From 813f0f6d391b7f24682204c22c059ef69b124fa6 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 30 六月 2025 23:59:15 +0800
Subject: [PATCH] 增加流程与程序关联查询
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 8f0a1f4..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());
@@ -47,6 +49,7 @@
machine.setPollingHours(vo.getPollingHours());
machine.setProgSendDir(vo.getProgSendDir());
machine.setProgReceiveDir(vo.getProgReceiveDir());
+ machine.setStatus(vo.getStatus());
machine.setRemark(vo.getRemark());
return this.updateById(machine);
@@ -63,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()) {
@@ -132,4 +138,13 @@
return true;
}
+
+ /**
+ * 鏍规嵁鏈哄簥缂栫爜鑾峰彇鏈哄簥
+ * @param machineCode 鏈哄簥缂栫爜
+ * @return
+ */
+ public Machine getByCode(String machineCode) {
+ return this.lambdaQuery().eq(Machine::getCode, machineCode).one();
+ }
}
--
Gitblit v1.9.3