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/report_work.go | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/model/report_work.go b/model/report_work.go
index 7ccff11..4f8d8a6 100644
--- a/model/report_work.go
+++ b/model/report_work.go
@@ -9,18 +9,20 @@
type (
ReportWork struct {
gorm.Model
- ProceduresID uint `gorm:"index;type:varchar(191)" json:"proceduresId"` //procedures琛ㄧ殑id
- WorkOrderID string `gorm:"index;type:varchar(191);not null" json:"workOrderId"`
- DeviceID string `gorm:"index;type:varchar(191)" json:"deviceId"`
- DeviceName string `gorm:"index;type:varchar(191)" json:"deviceName"`
- ProcedureID string `gorm:"index;type:varchar(191)" json:"procedureId"`
- Channel int32 `gorm:"index;" json:"channel"` //閫氶亾
- StartTime int64 `json:"startTime"`
- EndTime int64 `json:"endTime"`
- ReportAmount int `json:"reportAmount"` //鎶ュ伐鏁伴噺
- FinishAmount int `json:"finishAmount"` //鏈鎶ュ伐 - 涓婃鎶ュ伐
- WorkerID string `json:"workerID"` //鎶ュ伐浜篿d
- WorkerName string `json:"workerName"` //鎶ュ伐浜哄鍚�
+ ProceduresID uint `gorm:"index;type:varchar(191)" json:"proceduresId"` //procedures琛ㄧ殑id
+ ProductProcedureID string `gorm:"index;type:varchar(191);" json:"productProcedureID"` //浜у搧宸ュ簭id
+ WorkOrderID string `gorm:"index;type:varchar(191);" json:"workOrderId"`
+ DeviceID string `gorm:"index;type:varchar(191)" json:"deviceId"`
+ DeviceName string `gorm:"index;type:varchar(191)" json:"deviceName"`
+ ProcedureID string `gorm:"index;type:varchar(191)" json:"procedureId"`
+ StartTime int64 `json:"startTime"`
+ EndTime int64 `json:"endTime"`
+ ReportAmount int `json:"reportAmount"` //鎶ュ伐鏁伴噺
+ FinishAmount int `json:"finishAmount"` //鏈鎶ュ伐 - 涓婃鎶ュ伐
+ WorkerID string `json:"workerID"` //鎶ュ伐浜篿d
+ WorkerName string `json:"workerName"` //鎶ュ伐浜哄鍚�
+ WorkerTime int64 `json:"workerTime"` //宸ユ椂锛屽崟浣嶇
+ BarCode string `json:"barCode"` //鏉″舰鐮�
}
ReportWorkSearch struct {
@@ -103,11 +105,6 @@
return slf
}
-func (slf *ReportWorkSearch) SetChannel(channel int32) *ReportWorkSearch {
- slf.Channel = channel
- return slf
-}
-
func (slf *ReportWorkSearch) build() *gorm.DB {
var db = slf.Orm.Model(&ReportWork{})
@@ -139,6 +136,10 @@
db = db.Where("procedure_id = ?", slf.ProcedureID)
}
+ if slf.ProceduresID != 0 {
+ db = db.Where("procedures_id = ?", slf.ProceduresID)
+ }
+
if len(slf.Channels) > 0 {
db = db.Where("channel IN (?)", slf.Channels)
}
--
Gitblit v1.8.0