From 1f938212fd4d7c81480c777aead1a87e123afed9 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 03 二月 2026 10:39:59 +0800
Subject: [PATCH] fix: 导出的生产订单数据中完成状态更改为完成进度
---
src/main/java/com/ruoyi/production/controller/ProductOrderController.java | 29 ++++++++++++++++++++++++++---
src/main/java/com/ruoyi/production/dto/ProductOrderDto.java | 4 ++--
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
index 658b40a..4beb89f 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
import java.util.List;
@RequestMapping("productOrder")
@@ -51,9 +52,31 @@
@Log(title = "鐢熶骇璁㈠崟", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ProductOrderDto productOrderDto) {
- List<ProductOrderDto> list;
- list = productOrderService.pageProductOrder(new Page<>(1, -1), productOrderDto).getRecords();
- ExcelUtil<ProductOrderDto> util = new ExcelUtil<ProductOrderDto>(ProductOrderDto.class);
+ List<ProductOrderDto> list = productOrderService.pageProductOrder(new Page<>(1, -1), productOrderDto).getRecords();
+
+ if (list != null && !list.isEmpty()) {
+ list.forEach(item -> {
+ // 鍒ょ┖
+ if (item.getQuantity() == null || item.getCompleteQuantity() == null) {
+ item.setCompletionStatus(BigDecimal.ZERO);
+ return;
+ }
+
+ // 鍒ら浂
+ if (item.getQuantity().compareTo(BigDecimal.ZERO) == 0) {
+ item.setCompletionStatus(BigDecimal.ZERO);
+ return;
+ }
+ BigDecimal progress = item.getCompleteQuantity()
+ .divide(item.getQuantity(), 4, BigDecimal.ROUND_HALF_UP)
+ .multiply(new BigDecimal(100))
+ .setScale(2, BigDecimal.ROUND_HALF_UP);
+
+ item.setCompletionStatus(progress);
+ });
+ }
+
+ ExcelUtil<ProductOrderDto> util = new ExcelUtil<>(ProductOrderDto.class);
util.exportExcel(response, list, "鐢熶骇璁㈠崟鏁版嵁");
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
index 1a99346..dc2185a 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -39,8 +39,8 @@
@Excel(name = "宸ヨ壓璺嚎缂栧彿")
private String processRouteCode;
- @ApiModelProperty(value = "瀹屾垚鐘舵��")
- @Excel(name = "瀹屾垚鐘舵��")
+ @ApiModelProperty(value = "瀹屾垚杩涘害")
+ @Excel(name = "瀹屾垚杩涘害", suffix = "%")
private BigDecimal completionStatus;
@ApiModelProperty(value = "BOM缂栧彿")
--
Gitblit v1.9.3