From e798008109765f9f6085123b3c7bbd3102d7d49e Mon Sep 17 00:00:00 2001 From: jh_peng Date: Mon, 11 Nov 2024 16:32:46 +0800 Subject: [PATCH] V0 --- repository/test.data/report.chart.go | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/repository/test.data/report.chart.go b/repository/test.data/report.chart.go index 2e5d167..3d6961c 100644 --- a/repository/test.data/report.chart.go +++ b/repository/test.data/report.chart.go @@ -63,13 +63,14 @@ func PackagePassProbabilityLine(r *request.PackagePassProbabilityLine) ([]*model x = append(x, carbon.Parse(r.OrderDateStart).AddYears(i).Format("Y")) } } - max := math.MinInt - min := math.MaxInt + maxValue := math.MinInt + minValue := math.MaxInt var line []*model.Line for _, factory := range factories { + var pmc *model.PmcFile + global.Oracle.Where("pmc01 = ?", factory).Find(&pmc) var tcSfcFile []*model.TcSfcFile global.Oracle.Where("tc_sfc08 LIKE ? AND tc_sfc04 = ?", "%AB%", factory).Where(sql). - Preload("PmcFile"). Preload("TcSfdFile", func(db *gorm.DB) *gorm.DB { return db.Preload("ImaFile").Preload("RvaFile", func(db *gorm.DB) *gorm.DB { return db.Preload("IddFile") @@ -131,11 +132,11 @@ func PackagePassProbabilityLine(r *request.PackagePassProbabilityLine) ([]*model Round(4).Mul(decimal.NewFromFloat(100)) passProbabilityInt, _ := strconv.Atoi(passProbability.Round(0).String()) - if passProbabilityInt > max { - max = passProbabilityInt + 1 + if passProbabilityInt > maxValue { + maxValue = passProbabilityInt + 1 } - if passProbabilityInt < min { - min = passProbabilityInt - 1 + if passProbabilityInt < minValue { + minValue = passProbabilityInt - 1 } y = append(y, passProbability.String()) } @@ -144,12 +145,12 @@ func PackagePassProbabilityLine(r *request.PackagePassProbabilityLine) ([]*model } } line = append(line, &model.Line{ - Name: factory, + Name: pmc.Pmc03, X: x, Y: y, }) } - return line, max, min + return line, maxValue, minValue } func OrderNumberHistogram(r *request.PackagePassProbabilityLine) []*model.Histogram {