From 8664dd811a26ff7bd8fef037d21392e6e7a11990 Mon Sep 17 00:00:00 2001 From: jh_peng Date: Fri, 25 Oct 2024 11:34:17 +0800 Subject: [PATCH] =?UTF-8?q?V0=20=E5=9B=BE=E8=A1=A8=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repository/test.data/report.chart.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/repository/test.data/report.chart.go b/repository/test.data/report.chart.go index 1a998f4..c8f11d1 100644 --- a/repository/test.data/report.chart.go +++ b/repository/test.data/report.chart.go @@ -283,12 +283,12 @@ func PassProbabilityByFactory(r *request.PassProbabilityByFactory) ([]*model.Lin if r.Factory != "" { sql += "factory = '" + r.Factory + "'" } - global.PostGreSQL.Model(&model.Report{}).Where("step = ? AND order_date BETWEEN ? AND ?", r.Type, startDate, endDate). + global.PostGreSQL.Model(&model.Report{}).Where("step LIKE ? AND order_date BETWEEN ? AND ?", "%"+r.Type+"%", startDate, endDate). Where(sql).Group("factory").Select("Factory").Find(&factorys) for _, factory := range factorys { var x, lineY, histogramY []string var reports []*model.Report - global.PostGreSQL.Where("step = ? AND factory = ? AND order_date BETWEEN ? AND ?", r.Type, factory, startDate, endDate). + global.PostGreSQL.Where("step = ? AND factory = ? AND order_date BETWEEN ? AND ?", "%"+r.Type+"%", factory, startDate, endDate). Find(&reports) factoryMap := make(map[string][]string) for _, report := range reports { @@ -355,8 +355,8 @@ func FTPassProbabilityByProduct(r *request.PassProbabilityByProduct) (*model.Lin sql += "factory = '" + r.Factory + "'" } var reports []*model.Report - global.PostGreSQL.Where("step = ? AND product = ? AND order_date BETWEEN ? AND ?", - r.Type, r.Product, startDate, endDate).Preload("BinFail", func(db *gorm.DB) *gorm.DB { + global.PostGreSQL.Where("step LIKE ? AND product = ? AND order_date BETWEEN ? AND ?", + "%"+r.Type+"%", r.Product, startDate, endDate).Preload("BinFail", func(db *gorm.DB) *gorm.DB { return db.Where("report_site_id = ?", 0) }).Where(sql).Find(&reports) productMap := make(map[string][]string) @@ -462,16 +462,16 @@ func PassProbabilityLine(r *request.TestPassProbabilityLine) { func PassProbability(r *request.PassProbability) (interface{}, string) { var reports []*model.Report if len(r.Product) == 0 && len(r.Lot) == 0 { - global.PostGreSQL.Where("step = ? AND DATE(created_at) BETWEEN DATE(?) AND DATE(?)", r.Step, r.StartDate, r.EndDate). + global.PostGreSQL.Where("step LIKE ? AND DATE(created_at) BETWEEN DATE(?) AND DATE(?)", "%"+r.Step+"%", r.StartDate, r.EndDate). Order("created_at").Find(&reports) } else if len(r.Product) != 0 && len(r.Lot) == 0 { - global.PostGreSQL.Where("step = ? AND DATE(created_at) BETWEEN DATE(?) AND DATE(?)", r.Step, r.StartDate, r.EndDate). + global.PostGreSQL.Where("step LIKE ? AND DATE(created_at) BETWEEN DATE(?) AND DATE(?)", "%"+r.Step+"%", r.StartDate, r.EndDate). Where("product IN ?", r.Product).Order("created_at").Find(&reports) } else if len(r.Product) == 0 && len(r.Lot) != 0 { - global.PostGreSQL.Where("step = ? AND DATE(created_at) BETWEEN DATE(?) AND DATE(?)", r.Step, r.StartDate, r.EndDate). + global.PostGreSQL.Where("step LIKE ? AND DATE(created_at) BETWEEN DATE(?) AND DATE(?)", "%"+r.Step+"%", r.StartDate, r.EndDate). Where("lot IN ?", r.Lot).Order("created_at").Find(&reports) } else if len(r.Product) != 0 && len(r.Lot) != 0 { - global.PostGreSQL.Where("step = ? AND DATE(created_at) BETWEEN DATE(?) AND DATE(?)", r.Step, r.StartDate, r.EndDate). + global.PostGreSQL.Where("step LIKE ? AND DATE(created_at) BETWEEN DATE(?) AND DATE(?)", "%"+r.Step+"%", r.StartDate, r.EndDate). Where("product IN ? AND lot IN ?", r.Product, r.Lot).Order("created_at").Find(&reports) } @@ -714,22 +714,22 @@ func PassProbability(r *request.PassProbability) (interface{}, string) { func BinProbability(r *request.BinProbability) (interface{}, string) { var reports []*model.Report if len(r.Product) == 0 && len(r.Lot) == 0 { - global.PostGreSQL.Where("step = ? AND DATE(created_at) BETWEEN DATE(?) AND DATE(?)", r.Step, r.StartDate, r.EndDate). + global.PostGreSQL.Where("step LIKE ? AND DATE(created_at) BETWEEN DATE(?) AND DATE(?)", "%"+r.Step+"%", r.StartDate, r.EndDate). Preload("BinFail", func(db *gorm.DB) *gorm.DB { return db.Where("report_site_id = ?", 0) }).Order("created_at").Find(&reports) } else if len(r.Product) != 0 && len(r.Lot) == 0 { - global.PostGreSQL.Where("step = ? AND DATE(created_at) BETWEEN DATE(?) AND DATE(?)", r.Step, r.StartDate, r.EndDate). + global.PostGreSQL.Where("step LIKE ? AND DATE(created_at) BETWEEN DATE(?) AND DATE(?)", "%"+r.Step+"%", r.StartDate, r.EndDate). Where("product IN ?", r.Product).Preload("BinFail", func(db *gorm.DB) *gorm.DB { return db.Where("report_site_id = ?", 0) }).Order("created_at").Find(&reports) } else if len(r.Product) == 0 && len(r.Lot) != 0 { - global.PostGreSQL.Where("step = ? AND DATE(created_at) BETWEEN DATE(?) AND DATE(?)", r.Step, r.StartDate, r.EndDate). + global.PostGreSQL.Where("step LIKE ? AND DATE(created_at) BETWEEN DATE(?) AND DATE(?)", "%"+r.Step+"%", r.StartDate, r.EndDate). Where("lot IN ?", r.Lot).Preload("BinFail", func(db *gorm.DB) *gorm.DB { return db.Where("report_site_id = ?", 0) }).Order("created_at").Find(&reports) } else if len(r.Product) != 0 && len(r.Lot) != 0 { - global.PostGreSQL.Where("step = ? AND DATE(created_at) BETWEEN DATE(?) AND DATE(?)", r.Step, r.StartDate, r.EndDate). + global.PostGreSQL.Where("step LIKE ? AND DATE(created_at) BETWEEN DATE(?) AND DATE(?)", "%"+r.Step+"%", r.StartDate, r.EndDate). Where("product IN ? AND lot IN ?", r.Product, r.Lot).Preload("BinFail", func(db *gorm.DB) *gorm.DB { return db.Where("report_site_id = ?", 0) }).Order("created_at").Find(&reports)