fix(#23): 修复获取园区公共电费概况有问题

controller/report.go

@@ -10,6 +10,7 @@ import (
 	"electricity_bill_calc/tools"
 	"electricity_bill_calc/types"
 	"electricity_bill_calc/vo"
+	"fmt"
 	"log"
 	"strconv"
 
@@ -285,15 +286,47 @@ func listPublicMetersInReport(c *fiber.Ctx) error {
 		reportLog.Error("无法获取核算报表中的公共表计信息", zap.Error(err))
 		return result.Error(fiber.StatusInternalServerError, "无法获取核算报表中的公共表计信息。")
 	}
-	meterResponse := lo.Map(meters, func(meter *model.ReportDetailedPublicConsumption, _ int) *vo.ReportPublicQueryResponse {
-		m := &vo.ReportPublicQueryResponse{}
-		m.FromReportDetailPublicConsumption(meter)
-		return m
-	})
+
+	var meterResponses []vo.Public
+	for _, meter := range meters {
+		fmt.Println("000",meter.ParkMeterID)
+		fmt.Println("000",meter)
+		meterResponse := vo.Public{
+			Address: meter.Address,
+			AdjustLoss: model.ConsumptionUnit{
+				Amount:     meter.LossAdjust.Amount,
+				Fee:        meter.LossAdjust.Fee,
+				Price:      meter.LossAdjust.Price,
+				Proportion: meter.LossAdjust.Proportion,
+			},
+			Area:         meter.Area.Decimal.String(),
+			AttachedAt:   meter.AttachedAt,
+			Building:     meter.Building,
+			BuildingName: meter.BuildingName,
+			Code:         meter.ParkMeterID,
+			DetachedAt:  meter.DetachedAt,
+			DisplayRatio: strconv.FormatFloat(meter.DisplayRatio, 'f', -1, 64),
+			Enabled:      meter.Enabled,
+			OnFloor:      meter.OnFloor,
+			Overall: model.ConsumptionUnit{
+				Amount:     meter.Overall.Amount,
+				Fee:        meter.Overall.Fee,
+				Price:      meter.Overall.Price,
+				Proportion: meter.Overall.Proportion,
+			},
+			ParkID: meter.ParkID,
+			Ratio:  meter.Ratio.String(),
+			Seq:    meter.Seq,
+			Type:   float64(meter.MeterType),
+		}
+
+		meterResponses = append(meterResponses, meterResponse)
+	}
+	fmt.Println(meterResponses)
 	return result.Success(
 		"已经获取到指定核算报表中的分页公共表计的核算信息。",
 		response.NewPagedResponse(page, total).ToMap(),
-		fiber.Map{"public": meterResponse},
+		fiber.Map{"public": meterResponses},
 	)
 }