From 0a7d5b0104dc71b213dfc7efbaa8ff39a6f61f3f Mon Sep 17 00:00:00 2001
From: bluejay <253316343@qq.com>
Date: 星期四, 10 四月 2025 15:38:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
index 99153c6..6d2a4ae 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
@@ -45,6 +45,21 @@
public TableDataInfo list(ApsPartPlan apsPartPlan) {
// startPage();
List<ApsPartPlan> list = apsPartPlanService.selectApsPartPlanList(apsPartPlan);
+ List<SysDictData> suspendedDic = DictUtils.getDictCache("aps_is_suspended");
+ List<SysDictData> businessTypeDic = DictUtils.getDictCache("aps_business_type");
+ List<SysDictData> documentStatusDic = DictUtils.getDictCache("aps_document_status");
+ List<SysDictData> accountDic = DictUtils.getDictCache("aps_account");
+ list.parallelStream().forEach(plan->{
+ documentStatusDic.stream().filter(x -> x.getDictValue().equals( plan.getDocumentStatus().trim()))
+ .findFirst().ifPresent(sysDictData -> plan.setDocumentStatus(sysDictData.getDictLabel()));
+ accountDic.stream().filter(x -> x.getDictValue().equals( plan.getAccount().trim()))
+ .findFirst().ifPresent(sysDictData -> plan.setAccount(sysDictData.getDictLabel()));
+ businessTypeDic.stream().filter(x -> x.getDictValue().equals(plan.getBusinessType().trim()))
+ .findFirst().ifPresent(sysDictData -> plan.setBusinessType(sysDictData.getDictLabel()));
+ suspendedDic.stream().filter(x -> x.getDictValue().equals( plan.getIsSuspended()))
+ .findFirst().ifPresent(sysDictData -> plan.setIsSuspended(sysDictData.getDictLabel()));
+ });
+
return getDataTable(list);
}
@@ -182,8 +197,8 @@
* @Author: wwj
* @Date: 2025/4/9
*/
- @GetMapping("/confirmPart")
- public AjaxResult confirmPart(ApsPartPlanTemp apsPartPlanTemp) {
+ @PostMapping("/confirmPart")
+ public AjaxResult confirmPart(@RequestBody ApsPartPlanTemp apsPartPlanTemp) {
return toAjax(apsPartPlanService.confirmPart(apsPartPlanTemp));
}
--
Gitblit v1.9.3