From 0bfb4e53db6d0cad8fe7a59945e86ac3adc7744e Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期日, 08 十月 2023 14:12:40 +0800
Subject: [PATCH] 添加数据同步服务

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

diff --git a/model/process_model.go b/model/process_model.go
index 9729a0c..57e73a8 100644
--- a/model/process_model.go
+++ b/model/process_model.go
@@ -5,20 +5,21 @@
 	"apsClient/pkg/sqlitex"
 	"encoding/json"
 	"fmt"
-	"gorm.io/gorm"
+	"github.com/jinzhu/gorm"
 )
 
 type (
 	// ProcessModel 宸ヨ壓鍙傛暟
 	ProcessModel struct {
-		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:"isNew" gorm:"column:is_new;comment:鏄惁鏈�鏂扮殑"` //鏄惁鏈�鏂扮殑
+		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:"-"`                        //鍓嶇鐢�
 	}
 
 	ProcessModelSearch struct {
@@ -109,7 +110,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