From 4852d6c95e98ef9390d9cbebce97c1bb7fcb04ad Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 16 七月 2025 23:37:58 +0800
Subject: [PATCH] 机床回传文件调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 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 f41c3a4..df099c5 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
@@ -3,17 +3,26 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.api.R;
+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.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.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
@Slf4j
@RestController
@@ -30,7 +39,7 @@
*/
@Operation(summary = "鎺ユ敹", description = "鎺ユ敹鏂囦欢")
@PostMapping("/accept")
- public R<Void> accept(String ids) {
+ public R<Void> accept(@RequestParam String ids) {
service.accept(ids);
return R.success();
}
@@ -42,9 +51,9 @@
@PostMapping("/reject")
public R<Void> reject(@RequestParam String ids) {
try {
- service.removeBatchByIds(Func.toLongList(ids));
+ service.reject(ids);
} catch (Exception e) {
- log.error("鍒犻櫎寮傚父",e);
+ log.error("鎷掔粷寮傚父",e);
return R.fail(e.getMessage());
}
return R.status(true);
@@ -56,8 +65,27 @@
@Operation(summary = "鍒嗛〉鏌ヨ", description = "鍚嶇О鎴栫紪鐮�")
@GetMapping("/page")
public R<IPage<MachineBackFileVO>> page(MachineBackFileQueryVO query) {
-
IPage<MachineBackFileVO> pages = service.pageQuery(query);
return R.data(pages);
}
+
+ /**
+ * 鍒嗛〉
+ */
+ @Operation(summary = "瀵煎嚭Excel", description = "瀵煎嚭Excel")
+ @GetMapping("/export-excel")
+ public void exportExcel(MachineBackFileQueryVO query, HttpServletResponse response) {
+ query.setCurrent(1);
+ query.setSize(Integer.MAX_VALUE);
+
+ IPage<MachineBackFileVO> pages = service.pageQuery(query);
+ List<MachineBackFileExcelVO> list = new ArrayList<>();
+ pages.getRecords().forEach(m ->{
+ MachineBackFileExcelVO excelVO = new MachineBackFileExcelVO();
+ BeanUtils.copyProperties(m, excelVO);
+ excelVO.setCureStatus(m.getIsCured()==1?"宸插浐鍖�":"鏈浐鍖�");
+ list.add(excelVO);
+ });
+ ExcelUtil.export(response, "鏈哄簥鍥炰紶鏂囦欢" + DateUtil.time(), "鏈哄簥鍥炰紶鏂囦欢琛�", list, MachineBackFileExcelVO.class);
+ }
}
--
Gitblit v1.9.3