From b34bb5ce36e284689e3e836f8de648602863fe35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Fri, 3 Apr 2026 09:37:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E8=AE=A1=E7=AE=97;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contractManage/ContractManageApplicationService.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java
index 21498be71..deba0d3f3 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java
@@ -179,8 +179,8 @@ public class ContractManageApplicationService {
         return null;
     }
 
-    public List<Map<String, Object>> getSubjectAndPrice(SubjectAndPriceDTO contractManageDTO) {
-        List<Map<String, Object>> result = new ArrayList<>();
+    public List<SubjectAndPriceReturn> getSubjectAndPrice(SubjectAndPriceDTO contractManageDTO) {
+        List<SubjectAndPriceReturn> result = new ArrayList<>();
         Long settlementCustomersId = contractManageDTO.getSettlementCustomersId();
         Long organizationId = contractManageDTO.getOrganizationId();
         String sunjectCode = contractManageDTO.getSubjectCode();
@@ -225,7 +225,6 @@ public class ContractManageApplicationService {
                                         if (fieldsName != null && ("装卸费单价".equals(fieldsName) ||
                                                 "纸箱贴标单价".equals(fieldsName)||"木箱贴标单价".equals(fieldsName)
                                                 || "进出仓操作费单价".equals(fieldsName))) {
-                                            Map<String, Object> subjectAndPrice = new HashMap<>();
                                             Integer sort = (Integer) stringObjectMap.get("sort");
                                             String chargingId = (String) stringObjectMap.get("chargingId");
                                             String fields = (String) stringObjectMap.get("fields");
@@ -236,7 +235,7 @@ public class ContractManageApplicationService {
                                             subjectAndPriceReturn.setChargingId(chargingId);
                                             subjectAndPriceReturn.setFields(fields);
                                             subjectAndPriceReturn.setBillingRulesId(billingRulesId);
-                                            result.add(subjectAndPrice);
+                                            result.add(subjectAndPriceReturn);
                                         }
                                     }
                                 }