From dec8951aae400e54f6ee83a8f95867dba9da8af1 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 23 五月 2025 17:17:33 +0800
Subject: [PATCH] [钣金计划大表] 优化：焊缝统计导出Excel样式
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamTempController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamTempController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamTempController.java
index ba4c8d0..0dfd4c7 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamTempController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamTempController.java
@@ -2,6 +2,8 @@
import java.util.List;
+import com.aps.common.security.utils.DictUtils;
+import com.aps.system.api.domain.SysDictData;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -38,12 +40,24 @@
/**
* 鏌ヨ鐒婄紳-涓存椂鍒楄〃
*/
- @RequiresPermissions("weldSeamTemp:weldSeamTemp:list")
+
@GetMapping("/list")
public TableDataInfo list(ApsWeldSeamTemp apsWeldSeamTemp)
{
// startPage();
List<ApsWeldSeamTemp> list = apsWeldSeamTempService.selectApsWeldSeamTempList(apsWeldSeamTemp);
+ //宸ュ崟绫诲瀷
+ List<SysDictData> workOrderTypes = DictUtils.getDictCache("aps_weld_work_order_type");
+ //鍒嗙被
+ List<SysDictData> classification = DictUtils.getDictCache("aps_weld_classification");
+
+ list.forEach(tmp->{
+ classification.stream().filter(t->t.getDictValue().equals(tmp.getClassification()))
+ .findFirst().ifPresent(t->{ tmp.setClassification(t.getDictLabel());}) ;
+ workOrderTypes.stream().filter(t->t.getDictValue().equals(tmp.getWorkOrderType()))
+ .findFirst().ifPresent(t->{ tmp.setWorkOrderType(t.getDictLabel());}) ;
+ });
+
return getDataTable(list);
}
--
Gitblit v1.9.3