From c803f8549dcc49e756292b0cf6fbc1dab525b64a Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 16 四月 2025 13:41:23 +0800
Subject: [PATCH] 焊缝统计表-逻辑更新
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamTempController.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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..5422444 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;
@@ -44,6 +46,18 @@
{
// 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