From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix
---
model/process_model.go | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/model/process_model.go b/model/process_model.go
index 253860f..2418f40 100644
--- a/model/process_model.go
+++ b/model/process_model.go
@@ -33,6 +33,8 @@
Procedures []string
CurrentNumber string
Numbers []string
+ ProductNot string
+ ProcedureNot string
}
)
@@ -98,6 +100,11 @@
return slf
}
+func (slf *ProcessModelSearch) SetProductAndProcedureNot(product string, procedure string) *ProcessModelSearch {
+ slf.ProductNot, slf.ProcedureNot = product, procedure
+ return slf
+}
+
func (slf *ProcessModelSearch) SetProcedures(procedures []string) *ProcessModelSearch {
slf.Procedures = procedures
return slf
@@ -123,6 +130,10 @@
db = db.Where("`procedure` = ?", slf.Procedure)
}
+ if len(slf.ProductNot) != 0 && len(slf.ProcedureNot) != 0 {
+ db = db.Not("product = ? and procedure = ? ", slf.ProductNot, slf.ProcedureNot)
+ }
+
if len(slf.Procedures) != 0 {
db = db.Where("`procedure` IN (?)", slf.Procedures)
}
@@ -144,7 +155,7 @@
}
if len(slf.Numbers) != 0 {
- db = db.Where("number in ?", slf.Numbers)
+ db = db.Where("number in (?)", slf.Numbers)
}
return db
--
Gitblit v1.8.0