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 | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 ff1fb46..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,19 +40,31 @@
/**
* 鏌ヨ鐒婄紳-涓存椂鍒楄〃
*/
- @RequiresPermissions("gasPipingTemp:gasPipingTemp: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);
}
/**
* 瀵煎嚭鐒婄紳-涓存椂鍒楄〃
*/
- @RequiresPermissions("gasPipingTemp:gasPipingTemp:export")
+ @RequiresPermissions("weldSeamTemp:weldSeamTemp:export")
@Log(title = "鐒婄紳-涓存椂", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsWeldSeamTemp apsWeldSeamTemp)
@@ -63,7 +77,7 @@
/**
* 鑾峰彇鐒婄紳-涓存椂璇︾粏淇℃伅
*/
- @RequiresPermissions("gasPipingTemp:gasPipingTemp:query")
+ @RequiresPermissions("weldSeamTemp:weldSeamTemp:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
@@ -73,7 +87,7 @@
/**
* 鏂板鐒婄紳-涓存椂
*/
- @RequiresPermissions("gasPipingTemp:gasPipingTemp:add")
+ @RequiresPermissions("weldSeamTemp:weldSeamTemp:add")
@Log(title = "鐒婄紳-涓存椂", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsWeldSeamTemp apsWeldSeamTemp)
@@ -84,7 +98,7 @@
/**
* 淇敼鐒婄紳-涓存椂
*/
- @RequiresPermissions("gasPipingTemp:gasPipingTemp:edit")
+ @RequiresPermissions("weldSeamTemp:weldSeamTemp:edit")
@Log(title = "鐒婄紳-涓存椂", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsWeldSeamTemp apsWeldSeamTemp)
@@ -95,7 +109,7 @@
/**
* 鍒犻櫎鐒婄紳-涓存椂
*/
- @RequiresPermissions("gasPipingTemp:gasPipingTemp:remove")
+ @RequiresPermissions("weldSeamTemp:weldSeamTemp:remove")
@Log(title = "鐒婄紳-涓存椂", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
--
Gitblit v1.9.3