From 864fb1d07ccb7b4aa47730c324d77a8dc2b08dd4 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Wed, 12 Mar 2025 20:05:50 +0800 Subject: [PATCH] =?UTF-8?q?refactor(coal):=20=E4=BC=98=E5=8C=96=E6=B4=97?= =?UTF-8?q?=E7=85=A4=E6=97=A5=E6=8A=A5=E5=88=86=E6=9E=90=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=92=8C=20KFAC=20=E8=87=AA=E5=8A=A8=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 使用 BeanUtil 复制实体对象中的 KF 项列表，提高代码可读性和性能 - 修复 KFAC 自动完成脚本中的查询参数处理，简化代码结构 --- .../service/CoalWashingDailyAnalysisService.java | 4 +++- .../scripts/dict/enum/coalWashingDailyAnalysisKFAC.groovy | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/service/CoalWashingDailyAnalysisService.java b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/service/CoalWashingDailyAnalysisService.java index 81f734dd..730fa916 100644 --- a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/service/CoalWashingDailyAnalysisService.java +++ b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/service/CoalWashingDailyAnalysisService.java @@ -1,5 +1,6 @@ package cn.lihongjie.coal.coalWashingDailyAnalysis.service; +import cn.hutool.core.bean.BeanUtil; import cn.lihongjie.coal.base.dto.CommonQuery; import cn.lihongjie.coal.base.dto.IdRequest; import cn.lihongjie.coal.base.service.BaseService; @@ -156,7 +157,8 @@ public class CoalWashingDailyAnalysisService public CoalWashingDailyAnalysisDto updateMain(UpdateCoalWashingDailyAnalysisDto request) { CoalWashingDailyAnalysisEntity entity = this.repository.get(request.getId()); - List kfItems = entity.getKfItems(); + List kfItems = + BeanUtil.copyToList(entity.getKfItems(), CoalWashingDailyAnalysisKFItemVo.class); if (this.repository.containArchived(request.getId())) { throw new BizException("部分数据已归档，无法编辑或删除"); diff --git a/src/main/resources/scripts/dict/enum/coalWashingDailyAnalysisKFAC.groovy b/src/main/resources/scripts/dict/enum/coalWashingDailyAnalysisKFAC.groovy index aac14db7..16ed9213 100644 --- a/src/main/resources/scripts/dict/enum/coalWashingDailyAnalysisKFAC.groovy +++ b/src/main/resources/scripts/dict/enum/coalWashingDailyAnalysisKFAC.groovy @@ -12,5 +12,5 @@ def service = ioc.getBean(DictionaryService.class) -return service.autoComplete(new AutoCompleteRequest(tableName: "t_coal_washing_daily_analysis_kf_items kf inner join t_coal_washing_daily_analysis a on kf.coal_washing_daily_analysis_id = a.id", fieldName: "kf.name",organizationId: Ctx.currentUser().organizationId, query: params.get("query", null)?.asText())) +return service.autoComplete(new AutoCompleteRequest(tableName: "t_coal_washing_daily_analysis_kf_items kf inner join t_coal_washing_daily_analysis a on kf.coal_washing_daily_analysis_id = a.id", fieldName: "kf.name",organizationId: Ctx.currentUser().organizationId, query: params.get("query")?.asText()))