From d6b81a185f55a0322c0d404c9048cfb0a47488b9 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 09 十月 2023 19:29:07 +0800
Subject: [PATCH] add log

---
 model/process_model.go |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/model/process_model.go b/model/process_model.go
index c59674e..7c3afb4 100644
--- a/model/process_model.go
+++ b/model/process_model.go
@@ -11,15 +11,17 @@
 type (
 	// ProcessModel 宸ヨ壓鍙傛暟
 	ProcessModel struct {
-		gorm.Model
-		Number    string                 `gorm:"index;column:number;type:varchar(255);not null;default '';comment:宸ヨ壓妯″瀷缂栧彿" json:"number"` //宸ヨ壓妯″瀷缂栧彿
-		Product   string                 `gorm:"column:product;type:varchar(255);not null;default '';comment:浜у搧鍚嶇О" json:"product"`       //浜у搧鍚嶇О
-		Procedure string                 `gorm:"column:procedure;type:varchar(255);not null;default '';comment:宸ュ簭" json:"procedure"`     //宸ュ簭
-		Params    string                 `gorm:"type:text;comment:宸ヨ壓鍙傛暟閿�煎json涓�"`
-		ParamsMap map[string]interface{} `json:"paramsMap" gorm:"-"`
-		DeviceId  string                 `json:"deviceId" gorm:"-"`                        //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
-		IsNew     bool                   `json:"isNew" gorm:"column:is_new;comment:鏄惁鏈�鏂扮殑"` //鏄惁鏈�鏂扮殑
-		IsUpdate  bool                   `json:"isUpdate" gorm:"-"`                        //鍓嶇鐢�
+		gorm.Model   `json:"-"`
+		Number       string                 `gorm:"index;column:number;type:varchar(255);not null;default '';comment:宸ヨ壓妯″瀷缂栧彿" json:"number"` //宸ヨ壓妯″瀷缂栧彿
+		Product      string                 `gorm:"column:product;type:varchar(255);not null;default '';comment:浜у搧鍚嶇О" json:"product"`       //浜у搧鍚嶇О
+		Procedure    string                 `gorm:"column:procedure;type:varchar(255);not null;default '';comment:宸ュ簭" json:"procedure"`     //宸ュ簭
+		Params       string                 `gorm:"type:text;comment:宸ヨ壓鍙傛暟閿�煎json涓�"`
+		ParamsMap    map[string]interface{} `json:"paramsMap" gorm:"-"`
+		DeviceId     string                 `json:"deviceId" gorm:"-"`                    //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
+		IsNew        bool                   `json:"-" gorm:"column:is_new;comment:鏄惁鏈�鏂扮殑"` //鏄惁鏈�鏂扮殑
+		IsUpdate     bool                   `json:"isUpdate" gorm:"-"`                    //鍓嶇鐢�
+		NewParamsMap map[string]interface{} `json:"newParamsMap" gorm:"-"`
+		NewNumber    string                 `json:"newNumber" gorm:"-"`
 	}
 
 	ProcessModelSearch struct {
@@ -110,7 +112,7 @@
 	}
 
 	if len(slf.Procedures) != 0 {
-		db = db.Where("`procedure` in ?", slf.Procedures)
+		db = db.Where("`procedure` IN (?)", slf.Procedures)
 	}
 
 	if len(slf.Number) != 0 {

--
Gitblit v1.8.0