From 8e60278048df6d44a81ca8626cac63e5deab2761 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 28 八月 2025 15:10:05 +0800
Subject: [PATCH] 机床修改，增加文件对比
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java
index 1218ad1..f75af94 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java
@@ -10,20 +10,22 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.MachineService;
-import org.springblade.mdm.basesetting.machine.vo.MachineExcelVO;
-import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
-import org.springblade.mdm.basesetting.machine.vo.MachineVO;
+import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.basesetting.producedivision.entity.MdmDept;
+import org.springblade.mdm.basesetting.producedivision.service.MdmDeptService;
import org.springblade.mdm.gkw.programnode.service.MachineFileService;
import org.springblade.mdm.machineback.service.MachineBackFileService;
import org.springblade.mdm.machineback.vo.MachineBackFileExcelVO;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileVO;
+import org.springblade.system.pojo.entity.Dept;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
@Slf4j
@RestController
@@ -35,7 +37,10 @@
private MachineBackFileService service;
@Autowired
private MachineFileService machineFileService;
-
+ @Autowired
+ private MachineService machineService;
+ @Autowired
+ private MdmDeptService mdmDeptService;
/**
* 鎺ユ敹
*/
@@ -67,10 +72,27 @@
@Operation(summary = "鍒嗛〉鏌ヨ", description = "鍚嶇О鎴栫紪鐮�")
@GetMapping("/page")
public R<IPage<MachineBackFileVO>> page(MachineBackFileQueryVO query) {
+ List<Long> deptIds = new ArrayList<>();
+ if("workshop".equals(query.getNodeType()) || "seg".equals(query.getNodeType())) {
+ //鑺傜偣涓鸿溅闂淬�佸伐娈�
+ MdmDept dept = mdmDeptService.getById(query.getNodeId());
+
+ String idStr = dept.getAncestors()+","+dept.getId();
+ List<MdmDept> depts = mdmDeptService.lambdaQuery().likeRight(MdmDept::getParentId, query.getNodeId()).list();
+ deptIds.addAll(depts.stream().map(MdmDept::getId).toList());
+ deptIds.add(dept.getId());
+ //+鏈溅闂�
+ //Func.toStrList(",",idStr)
+ query.setDeptIds(deptIds);
+ }else if("machine".equals(query.getNodeType())){
+ Machine machine = machineService.getById(query.getNodeId());
+ query.setMachineCode(machine.getCode());
+ }else if("dir".equals(query.getNodeType())){
+ query.setMachineCode(query.getMachineCode());
+ }
IPage<MachineBackFileVO> pages = machineFileService.machineBackFilePageQuery(query);
return R.data(pages);
}
-
/**
* 鍒嗛〉
*/
--
Gitblit v1.9.3