From 3baca21e0e6563f8379359ef2ba78c224eb4bc80 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 九月 2025 22:45:51 +0800
Subject: [PATCH] 修复审批表，确认表内容
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/FileSendRecordController.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/FileSendRecordController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/FileSendRecordController.java
index 0209a43..0bae8fc 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/FileSendRecordController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/FileSendRecordController.java
@@ -4,19 +4,25 @@
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.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.producedivision.entity.MdmDept;
import org.springblade.mdm.basesetting.producedivision.service.MdmDeptService;
+import org.springblade.mdm.commons.service.OssFileCommonService;
+import org.springblade.mdm.machinefile.entity.FileSendRecord;
import org.springblade.mdm.machinefile.entity.MachineFile;
import org.springblade.mdm.machinefile.service.FileSendRecordService;
import org.springblade.mdm.machinefile.service.MachineFileChangeHisService;
import org.springblade.mdm.machinefile.service.MachineFileService;
import org.springblade.mdm.machinefile.vo.*;
import org.springblade.mdm.program.vo.CompareDataVO;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -39,15 +45,41 @@
@Slf4j
public class FileSendRecordController {
@Autowired
- private MdmDeptService mdmDeptService;
+ private OssFileCommonService ossFileCommonService;
@Autowired
private FileSendRecordService fileSendRecordService;
- @GetMapping("/file-page")
- @Operation(summary = "宸ユ帶缃戠洰褰曟枃浠跺垪琛�", description = "宸ユ帶缃戠洰褰曟枃浠跺垪琛�")
+ @GetMapping("/page")
+ @Operation(summary = "涓嬪彂鏂囦欢璁板綍鍒楄〃", description = "涓嬪彂鏂囦欢璁板綍鍒楄〃")
public R<IPage<FileSendRecordVO>> page(FileSendRecordQueryVO query) {
-
+ if(query.getCreateTimeEnd()!=null){
+ query.setCreateTimeEnd(query.getCreateTimeEnd().plusDays(1));
+ }
return R.data(fileSendRecordService.pageQuery(query));
}
+ @GetMapping("/download-by-id")
+ @Operation(summary = "涓嬪彂鏂囦欢璁板綍鍒楄〃", description = "涓嬪彂鏂囦欢璁板綍鍒楄〃")
+ public void downloadByRecordId(Long id,HttpServletResponse response) throws IOException {
+ FileSendRecord record = fileSendRecordService.getById(id);
+ ossFileCommonService.download(record.getOssName(),record.getName(),response);
+ }
+
+
+ @GetMapping("/export-excel")
+ @Operation(summary = "涓嬪彂鏂囦欢璁板綍琛ㄥ鍑�", description = "涓嬪彂鏂囦欢璁板綍琛ㄥ鍑�")
+ public void export(FileSendRecordQueryVO query, HttpServletResponse response) {
+ query.setCurrent(1);
+ query.setSize(Integer.MAX_VALUE);
+
+ IPage<FileSendRecordVO> pages = fileSendRecordService.pageQuery(query);
+ List<FileSendRecordExcelVO> list = new ArrayList<>();
+ pages.getRecords().forEach(m ->{
+ FileSendRecordExcelVO excelVO = new FileSendRecordExcelVO();
+ BeanUtils.copyProperties(m, excelVO);
+ list.add(excelVO);
+ });
+ ExcelUtil.export(response, "涓嬪彂鏂囦欢璁板綍琛�" + DateUtil.time(), "涓嬪彂鏂囦欢璁板綍琛�", list, FileSendRecordExcelVO.class);
+ }
+
}
--
Gitblit v1.9.3