From 4187bc6d6f6595958cac264eb49455bf4d716800 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 八月 2025 22:36:05 +0800
Subject: [PATCH] 加入确认表导出
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 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 2b32858..036fe3c 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,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
@@ -10,25 +12,38 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.mapper.MachineMapper;
+import org.springblade.mdm.basesetting.machine.vo.MachineExcel;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineSaveVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
+import org.springblade.mdm.basesetting.producedivision.entity.MdmDept;
+import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
+import org.springblade.mdm.basesetting.producedivision.service.MdmDeptService;
+import org.springblade.mdm.basesetting.producedivision.vo.DivisionExcel;
+import org.springblade.mdm.basesetting.producedivision.vo.ImportResult;
+import org.springblade.mdm.basesetting.producedivision.vo.QinzheFgbExcel;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.pojo.entity.Dept;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.InvalidPathException;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
@Service
public class MachineService extends BizServiceImpl<MachineMapper, Machine> {
@Autowired
private ISysClient sysClient;
+ @Autowired
+ private MdmDeptService mdmDeptService;
@Transactional
public void saveMachine(MachineSaveVO vo){
checkMachine(vo);
@@ -91,11 +106,13 @@
machine.setOperator(vo.getOperator());
machine.setControlSystem(vo.getControlSystem());
machine.setOwnerDept(vo.getOwnerDept());
- machine.setPollingHours(vo.getPollingHours());
machine.setProgSendDir(vo.getProgSendDir());
machine.setProgReceiveDir(vo.getProgReceiveDir());
+ machine.setProgTempDir(vo.getProgTempDir());
machine.setStatus(vo.getStatus());
machine.setRemark(vo.getRemark());
+ machine.setSendDirExpiryHours(vo.getSendDirExpiryHours());
+ machine.setReceiveDirExpiryHours(vo.getReceiveDirExpiryHours());
return this.updateById(machine);
}
@@ -116,9 +133,7 @@
query.setDeptAncestors(rs.getData().getAncestors()+","+rs.getData().getId());
}
}
- IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query), query);
-
- return page;
+ return this.getBaseMapper().pageQuery(Condition.getPage(query), query);
}
/**
@@ -185,4 +200,12 @@
public Machine getByCode(String machineCode) {
return this.lambdaQuery().eq(Machine::getCode, machineCode).one();
}
+
+ /**
+ * 鑾峰彇鎵�鏈夊惎鐢ㄧ姸鎬佺殑鏈哄簥鍒楄〃
+ * @return 鏈哄簥鍒楄〃
+ */
+ public List<Machine> getEnableMachines() {
+ return lambdaQuery().eq(Machine::getStatus,Machine.STATUS_ENABLE).list();
+ }
}
--
Gitblit v1.9.3