From a25ee90c656b39e652f24e3378ad2bf5698b162b Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期五, 20 十二月 2024 01:59:06 +0800
Subject: [PATCH] 添加疑似托管模型

---
 db/task_results.go |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/db/task_results.go b/db/task_results.go
index ae4367d..8409cf2 100644
--- a/db/task_results.go
+++ b/db/task_results.go
@@ -2,24 +2,25 @@
 
 import (
 	"fmt"
-	"gorm.io/gorm"
 	"time"
+
+	"gorm.io/gorm"
 )
 
 type ModelTaskResults struct {
 	BaseModel
-	Title         string `json:"name" gorm:"type:varchar(255)"`                                                //棰勮鍚嶇О,鏆傛椂鐢ㄤ换鍔″悕绉�
-	Event         string `json:"event" gorm:"type:varchar(255)"`                                               //棰勮浜嬩欢
-	ModelID       string `json:"modelID" gorm:"type:varchar(255)"`                                             //妯″瀷ID
-	ModelTaskID   string `json:"modelTaskID" gorm:"type:varchar(255)"`                                         //妯″瀷浠诲姟ID
-	OrgID         string `json:"orgID" gorm:"index;column:org_id;type:varchar(299);not null;"`                 //娲惧嚭鎵� domain unit ID
-	CommunityId   string `json:"communityID" gorm:"index;column:community_id;type:varchar(299);not null;"`     //灏忓尯ID
-	PicDate       string `json:"picDate"       gorm:"uniqueIndex:pic_date_first_person_id;type:varchar(255);"` //鎶撴媿鏃堕棿
-	FirstPersonID string `json:"-" gorm:"uniqueIndex:pic_date_first_person_id;type:varchar(255);"`             //绗竴涓汉鐨処D
-	ObjectIds     string `json:"objectIds" gorm:"type:text"`                                                   //浜嬩欢瀵硅薄锛屽彲浠ユ槸浜猴紝澶氫釜鐢ㄩ�楀彿鍒嗛殧
-	Location      string `json:"location" gorm:"type:varchar(255)"`                                            //鍙戠敓鍦扮偣
-	Building      string `json:"building" gorm:"type:varchar(255);"`                                           //妤兼爧
-	Floor         string `json:"floor"       gorm:"type:varchar(255);"`                                        //妤煎眰
+	Title         string `json:"name" gorm:"type:varchar(255)"`                                                // 棰勮鍚嶇О,鏆傛椂鐢ㄤ换鍔″悕绉�
+	Event         string `json:"event" gorm:"type:varchar(255)"`                                               // 棰勮浜嬩欢
+	ModelID       string `json:"modelID" gorm:"type:varchar(255)"`                                             // 妯″瀷ID
+	ModelTaskID   string `json:"modelTaskID" gorm:"type:varchar(255)"`                                         // 妯″瀷浠诲姟ID
+	OrgID         string `json:"orgID" gorm:"index;column:org_id;type:varchar(299);not null;"`                 // 娲惧嚭鎵� domain unit ID
+	CommunityId   string `json:"communityID" gorm:"index;column:community_id;type:varchar(299);not null;"`     // 灏忓尯ID
+	PicDate       string `json:"picDate"       gorm:"uniqueIndex:pic_date_first_person_id;type:varchar(255);"` // 鎶撴媿鏃堕棿
+	FirstPersonID string `json:"-" gorm:"uniqueIndex:pic_date_first_person_id;type:varchar(255);"`             // 绗竴涓汉鐨処D
+	ObjectIds     string `json:"objectIds" gorm:"type:text"`                                                   // 浜嬩欢瀵硅薄锛屽彲浠ユ槸浜猴紝澶氫釜鐢ㄩ�楀彿鍒嗛殧
+	Location      string `json:"location" gorm:"type:varchar(255)"`                                            // 鍙戠敓鍦扮偣
+	Building      string `json:"building" gorm:"type:varchar(255);"`                                           // 妤兼爧
+	Floor         string `json:"floor"       gorm:"type:varchar(255);"`                                        // 妤煎眰
 
 }
 
@@ -69,6 +70,11 @@
 	return slf
 }
 
+func (slf *ModelTaskResultsSearch) SetTaskId(id string) *ModelTaskResultsSearch {
+	slf.ModelTaskID = id
+	return slf
+}
+
 func (slf *ModelTaskResultsSearch) SetFirstPersonId(firstId string) *ModelTaskResultsSearch {
 	slf.FirstPersonID = firstId
 	return slf
@@ -97,6 +103,10 @@
 		db = db.Where("first_person_id = ?", slf.FirstPersonID)
 	}
 
+	if slf.ModelTaskID != "" {
+		db = db.Where("model_task_id = ?", slf.ModelTaskID)
+	}
+
 	if slf.Keyword != "" {
 		kw := "%" + slf.Keyword + "%"
 		db = db.Where("name like ?", kw)

--
Gitblit v1.8.0