From 05582688724c78bc70a7bc860193c67677f6c8cf Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 28 十月 2023 10:46:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm
---
model/serviceOrder.go | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/model/serviceOrder.go b/model/serviceOrder.go
index f593b5c..c3d350b 100644
--- a/model/serviceOrder.go
+++ b/model/serviceOrder.go
@@ -38,7 +38,7 @@
SaleChance SaleChance `gorm:"foreignKey:SaleChanceId"`
FaultTypeId int `gorm:"column:severity_id;type:int;not null;default:0;comment:鏁呴殰绫诲埆id" json:"faultTypeId"` // 鏁呴殰绫诲埆id
FaultType FaultType `gorm:"foreignKey:FaultTypeId"`
- SeverityId int `gorm:"column:severity_id;type:int;not null;default:0;comment:涓ラ噸绋嬪害id" json:"severity"` // 涓ラ噸绋嬪害id
+ SeverityId int `gorm:"column:severity_order_id;type:int;not null;default:0;comment:涓ラ噸绋嬪害id" json:"severityId"` // 涓ラ噸绋嬪害id
Severity Severity `gorm:"foreignKey:SeverityId"`
ServiceOrderStatusId int `gorm:"column:service_order_status_id;type:int;not null;default:0;comment:鏈嶅姟鍗曠姸鎬乮d" json:"serviceOrderStatusId"` // 澶勭悊鐘舵��
ServiceOrderStatus ServiceOrderStatus `gorm:"foreignKey:ServiceOrderStatusId"`
@@ -134,6 +134,9 @@
if len(slf.ServiceManIds) > 0 {
db = db.Where("service_man_id in ?", slf.ServiceManIds)
}
+ if slf.ServiceNumber != "" {
+ db = db.Where("service_number = ?", slf.ServiceNumber)
+ }
return db
}
@@ -216,6 +219,11 @@
return slf
}
+func (slf *ServiceOrderSearch) SetNumber(number string) *ServiceOrderSearch {
+ slf.ServiceNumber = number
+ return slf
+}
+
func (slf *ServiceOrderSearch) First() (*ServiceOrder, error) {
var db = slf.build()
var record = new(ServiceOrder)
@@ -260,3 +268,27 @@
var db = slf.build()
return db.Updates(data).Error
}
+
+func (slf *ServiceOrderSearch) Count() (int64, error) {
+ var db = slf.build()
+ var total int64
+ err := db.Count(&total).Error
+ return total, err
+}
+
+func (slf *ServiceOrderSearch) MaxAutoIncr() (int, error) {
+ type Result struct {
+ Max int
+ }
+
+ var (
+ result Result
+ db = slf.build()
+ )
+
+ err := db.Select("MAX(id) as max").Scan(&result).Error
+ if err != nil {
+ return result.Max, fmt.Errorf("max err: %v", err)
+ }
+ return result.Max, nil
+}
--
Gitblit v1.8.0