feat:完善项目信息

This commit is contained in:
henry
2022-01-11 14:54:20 +08:00
parent 8006d57506
commit 72c2cb091d
15 changed files with 299 additions and 38 deletions

View File

@ -0,0 +1,48 @@
package model
import (
"SciencesServer/app/common/model"
"SciencesServer/serve/orm"
"fmt"
"time"
)
type ServiceMessage struct {
*model.ServiceMessage
}
type ServiceMessageInfo struct {
*model.ServiceMessage
model.Area
HandleContent string `json:"handle_content"`
HandleCreatedAt time.Time `json:"handle_created_at"`
}
func (m *ServiceMessage) Message(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*ServiceMessageInfo, error) {
db := orm.GetDB().Table(m.TableName()+" AS m").
Select("m.*", "l.content AS handle_content", "l.created_at AS handle_created_at",
"t.province", "t.city").
Joins(fmt.Sprintf("LEFT JOIN (SELECT MAX(id) AS id, message_id, MAX(created_at) AS created_at, MAX(content) AS content "+
"FROM %s WHERE is_deleted = %d GROUP BY message_id) AS l ON m.id = l.message_id",
model.NewServiceMessageLog().TableName(), model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN %s AS t ON m.tenant_id = t.id", model.NewSysTenant().TableName()))
if len(where) > 0 {
for _, v := range where {
db = db.Where(v.Condition, v.Value)
}
}
out := make([]*ServiceMessageInfo, 0)
if err := db.Count(count).Error; err != nil {
return nil, err
}
if err := db.Order("m.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
func NewServiceMessage() *ServiceMessage {
return &ServiceMessage{model.NewServiceMessage()}
}

View File

@ -0,0 +1,11 @@
package model
import "SciencesServer/app/common/model"
type ServiceMessageLog struct {
*model.ServiceMessageLog
}
func NewServiceMessageLog() *ServiceMessageLog {
return &ServiceMessageLog{model.NewServiceMessageLog()}
}

View File

@ -14,6 +14,7 @@ type ServiceSolutionCase struct {
// ServiceSolutionCaseInfo 服务案例信息
type ServiceSolutionCaseInfo struct {
model.Model
model.ModelTenant
Title string `json:"title"`
model.Image
Description string `json:"description"`
@ -26,7 +27,7 @@ type ServiceSolutionCaseInfo struct {
// SolutionCase 案例信息
func (m *ServiceSolutionCase) SolutionCase(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*ServiceSolutionCaseInfo, error) {
db := orm.GetDB().Table(m.TableName()+" AS s").
Select("s.id", "s.title", "s.image", "s.description", "s.visits", "k.title AS kind_title", "s.created_at",
Select("s.id", "s.tenant_id", "s.title", "s.image", "s.description", "s.visits", "k.title AS kind_title", "s.created_at",
"t.province", "t.city").
Joins(fmt.Sprintf("LEFT JOIN %s AS t ON s.tenant_id = t.id", model.NewSysTenant().TableName())).
Joins(fmt.Sprintf("LEFT JOIN %s AS k ON s.kind_id = k.id", model.NewServiceSolutionCaseKind().TableName())).