From 2debc39d13bdce031221294b19750eea8ed53d49 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期四, 26 六月 2025 16:00:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/ModelController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/ModelController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/ModelController.java
index 9b18901..1e6f233 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/ModelController.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/ModelController.java
@@ -209,15 +209,16 @@
for (String adviceCode : demandAdviceCodeList) {
if (data.get(adviceCode) != null) {
- demandAdviceList.add(DecimalUtil.toPowerTransferDetRespVO(demandAdviceCodeMap.get(adviceCode).getParamName(), data.get(adviceCode)));
- }
- }
- for (String adviceCode : gasAdviceCodeList) {
- if (data.get(adviceCode) != null) {
- demandAdviceList.add(DecimalUtil.toPowerTransferDetRespVO(gasAdviceCodeMap.get(adviceCode).getParamName(), data.get(adviceCode)));
+ demandAdviceList.add(DecimalUtil.toPowerTransferDetRespVO(adviceCode, demandAdviceCodeMap.get(adviceCode).getParamName(), data.get(adviceCode)));
}
}
result.setDemandAdviceList(demandAdviceList);
+ for (String adviceCode : gasAdviceCodeList) {
+ if (data.get(adviceCode) != null) {
+ gasAdviceList.add(DecimalUtil.toPowerTransferDetRespVO(adviceCode, gasAdviceCodeMap.get(adviceCode).getParamName(), data.get(adviceCode)));
+ }
+ }
+ result.setGasAdviceList(gasAdviceList);
log.info("XFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXF");
break;
case JX:
--
Gitblit v1.9.3