This commit is contained in:
jh_peng 2024-11-11 09:47:25 +08:00
parent 38cc8f7b14
commit badd99a9a7
3 changed files with 11 additions and 3 deletions

View File

@ -1660,3 +1660,6 @@
2024-11-07 11:20:53 INFO | 192.168.0.172 | 200 | 24.5013452s | POST | 未登录 | /testData/report/fTPassProbabilityByProduct
2024-11-07 11:22:55 INFO | 192.168.0.172 | 200 | 1m44.9625741s | POST | 未登录 | /testData/report/fTPassProbabilityByProduct
2024-11-07 11:23:02 INFO | 192.168.0.172 | 200 | 37.7952ms | POST | 未登录 | /testData/report/fTPassProbabilityByProduct
2024-11-11 09:44:11 INFO | 192.168.0.172 | 200 | 7.066174s | POST | 未登录 | /testData/report/ft
2024-11-11 09:46:02 INFO | 192.168.0.172 | 200 | 1m45.1952285s | POST | 未登录 | /testData/report/ft
2024-11-11 09:46:19 INFO | 192.168.0.172 | 200 | 6.4455757s | POST | 未登录 | /testData/report/ft

View File

@ -2,7 +2,6 @@ package main
import (
"testData/initialization"
"testData/repository"
)
func main() {
@ -31,7 +30,6 @@ func main() {
initialization.InitCronListCron()
initialization.InitEmailCron()
initialization.InitTestFilesHandlerCron()
repository.TestFilesHandlerCron()
//var fileHandles []*model.FileHandled
//global.PostGreSQL.Where("lot = ? AND step = ?", "S3S592", "FT").Find(&fileHandles)
//for _, fileHandle := range fileHandles {

View File

@ -999,13 +999,20 @@ func FTList(r *request.FTList) ([]*model.FTShowList, int64) {
}
var reports []*model.Report
global.PostGreSQL.Where("pbi = ? AND product = ? AND lot = ? AND step LIKE ?", ftList.PBI, ftList.Product, ftList.Lot, "%FT%").
global.PostGreSQL.Where("pbi = ? AND lot = ? AND step LIKE ?", ftList.PBI, ftList.Lot, "%FT%").
Order("pbi").
Preload("BinFail", func(db *gorm.DB) *gorm.DB {
return db.Where("report_site_id = ?", "0")
}).Preload("Site", func(db *gorm.DB) *gorm.DB {
return db.Preload("BinFail")
}).Find(&reports)
//global.PostGreSQL.Where("pbi = ? AND product = ? AND lot = ? AND step LIKE ?", ftList.PBI, ftList.Product, ftList.Lot, "%FT%").
// Order("pbi").
// Preload("BinFail", func(db *gorm.DB) *gorm.DB {
// return db.Where("report_site_id = ?", "0")
// }).Preload("Site", func(db *gorm.DB) *gorm.DB {
// return db.Preload("BinFail")
// }).Find(&reports)
for _, report := range reports {
//var finalReports []*model.FinalReport