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> getSubjectAndPrice(SubjectAndPriceDTO contractManageDTO) { - List> result = new ArrayList<>(); + public List getSubjectAndPrice(SubjectAndPriceDTO contractManageDTO) { + List 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 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); } } }