diff --git a/repository/test.data/chart.go b/repository/test.data/chart.go index 6138ff0..70b528d 100644 --- a/repository/test.data/chart.go +++ b/repository/test.data/chart.go @@ -780,8 +780,8 @@ func CPMap(req *request.CPMap) (map[string]interface{}, error) { // CP测试没有子批次 var fileHandle *model.FileHandled - global.PostGreSQL.Where("pbi = ? AND product = ? AND lot = ? AND wafer_id = ? AND step = ?", - req.PBI, req.Product, req.Lot, req.WaferID, req.Step). + global.PostGreSQL.Where("pbi = ? AND product = ? AND lot = ? AND wafer_id = ? AND step LIKE ?", + req.PBI, req.Product, req.Lot, req.WaferID, "%"+req.Step+"%"). Find(&fileHandle) //f, err := os.Open(fileHandle.Path) diff --git a/repository/test.file.handler.go b/repository/test.file.handler.go index 80430dd..4f8a1d6 100644 --- a/repository/test.file.handler.go +++ b/repository/test.file.handler.go @@ -9,7 +9,7 @@ import ( func TestFilesHandlerCron() { var fileTexts []*model.FileText //global.PostGreSQL.Where("processed = ? AND doubt = ? AND factory != ?", false, false, "江苏芯德").Order("procedure").Find(&fileTexts) - global.PostGreSQL.Where("processed = ? AND doubt = ? AND factory != ?", false, false, "江苏芯德").Order("procedure").Find(&fileTexts) + global.PostGreSQL.Where("processed = ? AND doubt = ?", false, false).Order("procedure").Find(&fileTexts) for _, fileText := range fileTexts { if err := test_data.HandleSTS8200Excel(fileText); err != nil { continue