From 66a85c70afb149986871febe17a4133b6995cd09 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 30 十一月 2023 19:58:02 +0800
Subject: [PATCH] dashboard接口和数据表
---
model/procedures.go | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/model/procedures.go b/model/procedures.go
index c1df06c..d30f5a9 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -12,8 +12,9 @@
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"` //閫氶亾
@@ -193,7 +194,7 @@
}
if slf.StartTimeMin != 0 {
- db = db.Where("start_time >= ?", slf.EndTimeMin)
+ db = db.Where("start_time >= ?", slf.StartTimeMin)
}
if slf.EndTimeMin != 0 {
@@ -201,7 +202,7 @@
}
if slf.EndTimeMax != 0 {
- db = db.Where("end_time < ?", slf.StartTimeMax)
+ db = db.Where("end_time < ?", slf.EndTimeMax)
}
if slf.Status != 0 {
@@ -336,7 +337,7 @@
db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
}
- if slf.Offset*slf.Limit > 0 {
+ if slf.Limit > 0 {
db = db.Offset(slf.Offset).Limit(slf.Limit)
}
--
Gitblit v1.8.0