From dd39847ba992605ef5fe2254140e8bfd8cf04b25 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 06 二月 2025 14:39:45 +0800
Subject: [PATCH] 修改托管模型
---
db/task_results.go | 27 ++++++++++++++-------------
models/disappear.go | 3 +--
db/db.go | 6 +++---
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/db/db.go b/db/db.go
index 1251033..695e8d5 100644
--- a/db/db.go
+++ b/db/db.go
@@ -180,13 +180,13 @@
Alias: "age",
Name: "骞撮緞娈�",
Type: "range",
- Must: true,
+ Must: false,
Unit: "宀�",
Range: "1,100",
Value: "60, 90",
ValType: "int",
Operator: "==",
- Sort: 1,
+ Sort: 2,
},
},
{
@@ -203,7 +203,7 @@
Value: "",
ValType: "string",
Operator: "==",
- Sort: 2,
+ Sort: 1,
},
},
}
diff --git a/db/task_results.go b/db/task_results.go
index 8409cf2..17de425 100644
--- a/db/task_results.go
+++ b/db/task_results.go
@@ -9,19 +9,20 @@
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
+ PicDate string `json:"picDate" gorm:"type:varchar(255);"` // 鎶撴媿鏃堕棿
+ FirstPersonID string `json:"-" gorm:"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);"` // 妤煎眰
}
func (m *ModelTaskResults) TableName() string {
diff --git a/models/disappear.go b/models/disappear.go
index 542bd0f..c82bfcf 100644
--- a/models/disappear.go
+++ b/models/disappear.go
@@ -109,8 +109,7 @@
snapshot_count_summary AS s
JOIN person AS p ON p.id = s.document_number
WHERE
- s.STATUS = 'resident'
- AND p.id_card != ""
+ p.id_card != ""
AND TIMESTAMPDIFF(
YEAR,
STR_TO_DATE( CASE WHEN LENGTH( id_card ) = 18 THEN SUBSTRING( id_card, 7, 8 ) ELSE NULL END, '%Y%m%d' ),
--
Gitblit v1.8.0