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/procedures.go |   73 ++++++++++++++++++++++++++++++------
 1 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/model/procedures.go b/model/procedures.go
index 4c93059..79e3842 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -7,19 +7,24 @@
 	"encoding/json"
 	"fmt"
 	"github.com/jinzhu/gorm"
+	"strings"
 )
 
 type (
 	Procedures struct {
 		gorm.Model
-		WorkOrderID        string `gorm:"index;type:varchar(191);not null" json:"-"`
-		OrderID            string `gorm:"index;type:varchar(191);not null" json:"-"`
+		ProductProcedureID string `gorm:"index;type:varchar(191);" json:"productProcedureID"` //浜у搧宸ュ簭id
+		WorkOrderID        string `gorm:"index;type:varchar(191);" json:"-"`
+		OrderID            string `gorm:"index;type:varchar(191);" json:"-"`
 		DeviceID           string `gorm:"index;type:varchar(191)" json:"deviceId"`
 		ProcedureID        string `gorm:"index;type:varchar(191)" json:"procedureId"`
 		Channel            int32  `gorm:"index;" json:"channel"`            //閫氶亾
 		ProcessModelNumber string `gorm:"index;" json:"processModelNumber"` //宸ヨ壓妯″瀷缂栧彿
 		StartTime          int64  `json:"startTime"`
 		EndTime            int64  `json:"endTime"`
+		RealStartTime      int64  `json:"realStartTime"`
+		RealEndTime        int64  `json:"realEndTime"`
+		FinishedQuantity   int    `gorm:"type:int;" json:"finishedQuantity"`
 		Status             ProcedureStatus
 		ProcedureData      string                  `json:"-"`                  //common.ProductProcedure  json涓�
 		ProceduresInfo     common.ProductProcedure `json:"procedure" gorm:"-"` //common.ProductProcedure  瀵硅薄
@@ -32,11 +37,16 @@
 		PageSize     int
 		Orm          *gorm.DB
 		Preload      bool
+		StartTimeMin int64
 		StartTimeMax int64
 		EndTimeMin   int64
+		EndTimeMax   int64
 		StatusNot    ProcedureStatus
 		ProcedureIds []string
 		Channels     []int32
+		Offset       int
+		Limit        int
+		Fields       []string
 	}
 )
 
@@ -52,13 +62,15 @@
 	return "procedures"
 }
 func (slf *Procedures) AfterFind(db *gorm.DB) error {
-	var proceduresInfo common.ProductProcedure
-	err := json.Unmarshal([]byte(slf.ProcedureData), &proceduresInfo)
-	if err != nil {
-		logx.Errorf("AfterFind Unmarshal err: %v", err.Error())
-		return err
+	if slf.ProcedureData != "" {
+		var proceduresInfo common.ProductProcedure
+		err := json.Unmarshal([]byte(slf.ProcedureData), &proceduresInfo)
+		if err != nil {
+			logx.Errorf("AfterFind Unmarshal err: %v", err.Error())
+			return err
+		}
+		slf.ProceduresInfo = proceduresInfo
 	}
-	slf.ProceduresInfo = proceduresInfo
 	return nil
 }
 
@@ -79,6 +91,11 @@
 	return slf
 }
 
+func (slf *ProceduresSearch) SetOffset(offset, limit int) *ProceduresSearch {
+	slf.Offset, slf.Limit = offset, limit
+	return slf
+}
+
 func (slf *ProceduresSearch) SetOrder(order string) *ProceduresSearch {
 	slf.Order = order
 	return slf
@@ -94,6 +111,11 @@
 	return slf
 }
 
+func (slf *ProceduresSearch) SetStartTimeMin(ts int64) *ProceduresSearch {
+	slf.StartTimeMin = ts
+	return slf
+}
+
 func (slf *ProceduresSearch) SetStartTimeMax(ts int64) *ProceduresSearch {
 	slf.StartTimeMax = ts
 	return slf
@@ -101,6 +123,11 @@
 
 func (slf *ProceduresSearch) SetEndTimeMin(ts int64) *ProceduresSearch {
 	slf.EndTimeMin = ts
+	return slf
+}
+
+func (slf *ProceduresSearch) SetEndTimeMax(ts int64) *ProceduresSearch {
+	slf.EndTimeMax = ts
 	return slf
 }
 
@@ -139,6 +166,11 @@
 	return slf
 }
 
+func (slf *ProceduresSearch) SetFields(fields []string) *ProceduresSearch {
+	slf.Fields = fields
+	return slf
+}
+
 func (slf *ProceduresSearch) build() *gorm.DB {
 	var db = slf.Orm.Model(&Procedures{})
 
@@ -166,8 +198,16 @@
 		db = db.Where("start_time <= ?", slf.StartTimeMax)
 	}
 
+	if slf.StartTimeMin != 0 {
+		db = db.Where("start_time >= ?", slf.StartTimeMin)
+	}
+
 	if slf.EndTimeMin != 0 {
 		db = db.Where("end_time > ?", slf.EndTimeMin)
+	}
+
+	if slf.EndTimeMax != 0 {
+		db = db.Where("end_time < ?", slf.EndTimeMax)
 	}
 
 	if slf.Status != 0 {
@@ -190,6 +230,10 @@
 		db = db.Where("channel IN (?)", slf.Channels)
 	}
 
+	if len(slf.Fields) > 0 {
+		db = db.Select(strings.Join(slf.Fields, ","))
+	}
+
 	return db
 }
 
@@ -207,11 +251,11 @@
 // CreateBatch 鎵归噺鎻掑叆
 func (slf *ProceduresSearch) CreateBatch(records []*Procedures) error {
 	var db = slf.build()
-
-	if err := db.Create(&records).Error; err != nil {
-		return fmt.Errorf("create batch err: %v, records: %+v", err, records)
+	for _, record := range records {
+		if err := db.Create(record).Error; err != nil {
+			return fmt.Errorf("create batch err: %v, records: %+v", err, records)
+		}
 	}
-
 	return nil
 }
 
@@ -301,6 +345,11 @@
 	if slf.PageNum*slf.PageSize > 0 {
 		db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
 	}
+
+	if slf.Limit > 0 {
+		db = db.Offset(slf.Offset).Limit(slf.Limit)
+	}
+
 	if err := db.Find(&records).Error; err != nil {
 		return records, total, fmt.Errorf("find records err: %v", err)
 	}

--
Gitblit v1.8.0