From c5b91210fc14caaffb6df8a76bf12bc29c753467 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 19 六月 2025 19:12:00 +0800
Subject: [PATCH] 机床回传代码更新
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
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 2a076f8..593a510 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
@@ -4,11 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springblade.mdm.machineback.entity.MachineBackFile;
import org.springblade.mdm.machineback.mapper.MachineBackFileMapper;
+import org.springblade.mdm.machineback.vo.MachineBackFileHandleQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileVO;
import org.springframework.stereotype.Service;
@@ -17,16 +19,11 @@
@Service
public class MachineBackFileService extends BizServiceImpl<MachineBackFileMapper, MachineBackFile> {
- /*
- @Transactional
- public void save(MachineSaveVO vo){
- //TODO
- Machine machine = new Machine();
- BeanUtil.copyProperties(vo, machine);
- this.save(machine);
- }
- */
+ /**
+ * 鎺ュ彈
+ * @param ids
+ */
public void accept(String ids) {
List<Long> idList = Func.toLongList(ids);
@@ -34,11 +31,16 @@
for(Long id : idList){
MachineBackFile backFile = this.getById(id);
backFile.setStatus(MachineBackFile.STATUS_ACCEPTED);
+ backFile.setConfirmTime(DateUtil.now());
this.updateById(backFile);
}
}
+ /**
+ * 鎷掔粷
+ * @param ids
+ */
public void reject(String ids) {
List<Long> idList = Func.toLongList(ids);
@@ -60,4 +62,9 @@
return page;
}
+
+ public IPage<MachineBackFileVO> handlePageQuery(MachineBackFileHandleQueryVO query) {
+ IPage<MachineBackFileVO> page = this.getBaseMapper().handlePageQuery(Condition.getPage(query),query);
+ return page;
+ }
}
--
Gitblit v1.9.3