From ee5fac6d743c3e9e2ddd2b9ce0407b9731a2c3c7 Mon Sep 17 00:00:00 2001
From: bluejay <253316343@qq.com>
Date: 星期三, 09 四月 2025 17:35:23 +0800
Subject: [PATCH] 调整list查询接口，进行数据字典的转义
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java | 15 +++++++++++++++
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java | 16 +++++++++++++++-
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingPlanController.java | 14 ++++++++++++++
aps-modules/aps-core/src/main/resources/mapper/core/ApsPartPlanMapper.xml | 4 ++--
4 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingPlanController.java
index a41d774..343911d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingPlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingPlanController.java
@@ -54,6 +54,20 @@
{
// startPage();
List<ApsGasPipingPlan> list = apsGasPipingPlanService.selectApsGasPipingPlanList(apsGasPipingPlan);
+ 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);
}
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..d9253c9 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);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java
index 54805ba..27b6162 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java
@@ -39,8 +39,22 @@
@RequiresPermissions("ApsPlatePlan:ApsPlatePlan:list")
@GetMapping("/list")
public TableDataInfo list(ApsPlatePlan apsPlatePlan) {
- startPage();
+ //startPage();
List<ApsPlatePlan> list = apsPlatePlanService.selectApsPlatePlanList(apsPlatePlan);
+ 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);
}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartPlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartPlanMapper.xml
index 3fa4b0e..1ed7f11 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartPlanMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartPlanMapper.xml
@@ -54,9 +54,9 @@
<if test="weekCycle != null and weekCycle != ''"> and week_cycle = #{weekCycle}</if>
<if test="mainPartNumber != null and mainPartNumber != ''"> and main_part_number = #{mainPartNumber}</if>
<if test="mainPartDrawingNumber != null and mainPartDrawingNumber != ''"> and main_part_drawing_number = #{mainPartDrawingNumber}</if>
- <if test="customer != null and customer != ''"> and customer like concat('%', #{customer}, '%')</if>
+ <if test="customer != null and customer != ''"> and customer like '%' || #{customer} || '%' </if>
<if test="businessType != null and businessType != ''"> and business_type = #{businessType}</if>
- <if test="documentNumber != null and documentNumber != ''"> and document_number = #{documentNumber}</if>
+ <if test="documentNumber != null and documentNumber != ''"> and document_number like '%' || #{documentNumber} || '%'</if>
<if test="requirementType != null and requirementType != ''"> and requirement_type = #{requirementType}</if>
<if test="documentStatus != null and documentStatus != ''"> and document_status = #{documentStatus}</if>
<if test="itemNumber != null and itemNumber != ''"> and item_number = #{itemNumber}</if>
--
Gitblit v1.9.3