From e992aa74b2a75653f007ab12a83cfc28aee7d7a6 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 28 四月 2026 17:33:03 +0800
Subject: [PATCH] fix: 报工台账导出修改
---
src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
index f4b85bb..8c4317e 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.production.dto.ProductionProductMainDetailExportDto;
import com.ruoyi.production.dto.ProductionProductMainDto;
+import com.ruoyi.production.dto.ProductionProductMainSummaryExportDto;
import com.ruoyi.production.dto.ProductionReportDailySummaryDto;
import com.ruoyi.production.dto.ProductionReportStateDto;
import com.ruoyi.production.pojo.ProductionProductMain;
@@ -29,6 +31,7 @@
/**
* 鎶ュ伐鏌ヨ
+ *
* @param page
* @param productionProductMainDto
* @return
@@ -64,6 +67,7 @@
/**
* 鎶ュ伐鏂板鏇存柊
+ *
* @param productionProductMainDto
* @return
*/
@@ -108,13 +112,35 @@
/**
- * 瀵煎嚭
+ * 鎶ュ伐鍙拌处姹囨�诲鍑�
*/
+ @ApiOperation("鎶ュ伐鍙拌处姹囨�诲鍑�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "workOrderIds", value = "宸ュ崟ID鍒楄〃, 鍙紶澶氫釜", allowMultiple = true, dataType = "long", paramType = "query"),
+ @ApiImplicitParam(name = "workOrderNo", value = "宸ュ崟缂栧彿(妯＄硦)", dataType = "string", paramType = "query"),
+ @ApiImplicitParam(name = "workOrderStatus", value = "宸ュ崟鐘舵��", dataType = "string", paramType = "query")
+ })
@PostMapping("/export")
public void export(HttpServletResponse response, ProductionProductMainDto productionProductMainDto) {
- List<ProductionProductMainDto> list;
- list = productionProductMainService.listPageProductionProductMainDto(new Page<>(1, -1), productionProductMainDto).getRecords();
- ExcelUtil<ProductionProductMainDto> util = new ExcelUtil<ProductionProductMainDto>(ProductionProductMainDto.class);
- util.exportExcel(response, list, "鐢熶骇鎶ュ伐鏁版嵁");
+ List<ProductionProductMainSummaryExportDto> list = productionProductMainService.listSummaryExportData(productionProductMainDto);
+ ExcelUtil<ProductionProductMainSummaryExportDto> util = new ExcelUtil<>(ProductionProductMainSummaryExportDto.class);
+ util.exportExcel(response, list, "鐢熶骇鎶ュ伐姹囨�绘暟鎹�");
+ }
+
+ /**
+ * 鎶ュ伐鏄庣粏瀵煎嚭
+ */
+ @ApiOperation("鎶ュ伐鏄庣粏瀵煎嚭")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "workOrderIds", value = "宸ュ崟ID鍒楄〃, 鍙紶澶氫釜", allowMultiple = true, dataType = "long", paramType = "query"),
+ @ApiImplicitParam(name = "workOrderId", value = "宸ュ崟ID", dataType = "long", paramType = "query"),
+ @ApiImplicitParam(name = "startDate", value = "寮�濮嬫棩鏈�(鎸夌粨鏉熸椂闂磋繃婊�, yyyy-MM-dd)", dataType = "string", paramType = "query"),
+ @ApiImplicitParam(name = "endDate", value = "缁撴潫鏃ユ湡(鎸夌粨鏉熸椂闂磋繃婊�, yyyy-MM-dd)", dataType = "string", paramType = "query")
+ })
+ @PostMapping("/exportDetail")
+ public void exportDetail(HttpServletResponse response, ProductionProductMainDto productionProductMainDto) {
+ List<ProductionProductMainDetailExportDto> list = productionProductMainService.listDetailExportData(productionProductMainDto);
+ ExcelUtil<ProductionProductMainDetailExportDto> util = new ExcelUtil<>(ProductionProductMainDetailExportDto.class);
+ util.exportExcel(response, list, "鐢熶骇鎶ュ伐鏄庣粏鏁版嵁");
}
}
--
Gitblit v1.9.3