williamet/cas_tt_cloud_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目信息

Browse Source
This commit is contained in:
henry
2022-01-12 15:05:14 +08:00
parent 0d49575e06
commit 4ec0953a29
33 changed files with 817 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
app/api/admin/api/activity.go
View File

@ -1 +1,151 @@
package api
import (
"SciencesServer/app/api/admin/controller/activity"
"SciencesServer/app/basic/api"
"SciencesServer/app/basic/config"
"SciencesServer/app/session"
"github.com/gin-gonic/gin"
)
type Activity struct{}
func (*Activity) Instance(c *gin.Context) {
form := &struct {
api.TenantIDStringForm
Title string `json:"title" form:"title"`
Contact string `json:"contact" form:"contact"`
ContactMobile string `json:"contact_mobile" form:"contact_mobile"`
api.PageForm
}{}
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
return
}
data, err := activity.NewInstance()(api.GetSession()(c).(*session.Admin)).Index(form.Convert(), form.Title,
form.Contact, form.ContactMobile, form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
func (*Activity) Detail(c *gin.Context) {
form := new(api.IDStringForm)
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
return
}
data, err := activity.NewInstance()(api.GetSession()(c).(*session.Admin)).Detail(form.Convert())
api.APIResponse(err, data)(c)
}
func (*Activity) Form(c *gin.Context) {
form := &struct {
api.IDStringForm
ApplyID string `json:"apply_id" form:"apply_id"`
api.TenantIDStringForm
api.ImageForm
Title string `json:"title" form:"title" binding:"required"`
Content string `json:"content" form:"content" binding:"required"`
Contact string `json:"contact" form:"contact" binding:"required"`
ContactMobile string `json:"contact_mobile" form:"contact_mobile"`
BeginAt string `json:"begin_at" form:"begin_at" binding:"required"`
FinishAt string `json:"finish_at" form:"finish_at" binding:"required"`
JoinDeadline string `json:"join_deadline" form:"join_deadline" binding:"required"`
config.Area
Industrys []string `json:"industrys" form:"industrys"`
Amount float64 `json:"amount" form:"amount"`
MaxNumber int `json:"max_number" form:"max_number"`
NotifyCrowd int `json:"notify_crowd" form:"notify_crowd"`
IsHome int `json:"is_home" form:"is_home"`
Sort int `json:"sort" form:"sort"`
Status int `json:"status" form:"status"`
}{}
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
return
}
err := activity.NewInstance()(api.GetSession()(c).(*session.Admin)).Form(&activity.InstanceParams{
ID: form.IDStringForm.Convert(), ApplyID: (&api.IDStringForm{ID: form.ApplyID}).Convert(),
TenantID: form.TenantIDStringForm.Convert(), Title: form.Title, Contact: form.Contact, ContactMobile: form.ContactMobile,
Image: form.FilterImageURL(), Content: form.Content, BeginAt: form.BeginAt, FinishAt: form.FinishAt,
JoinDeadline: form.JoinDeadline, Area: form.Area, Industrys: form.Industrys, Amount: form.Amount,
MaxNumber: form.MaxNumber, NotifyCrowd: form.NotifyCrowd, IsHome: form.IsHome, Sort: form.Sort, Status: form.Status,
})
api.APIResponse(err)(c)
}
func (*Activity) Delete(c *gin.Context) {
form := new(api.IDStringForm)
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
return
}
err := activity.NewInstance()(api.GetSession()(c).(*session.Admin)).Delete(form.Convert())
api.APIResponse(err)(c)
}
func (*Activity) Joins(c *gin.Context) {
form := &struct {
ActivityID string `json:"activity_id" form:"activity_id" binding:"required"`
api.PageForm
}{}
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
return
}
data, err := activity.NewInstance()(api.GetSession()(c).(*session.Admin)).Joins(
(&api.IDStringForm{ID: form.ActivityID}).Convert(), form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
func (*Activity) Apply(c *gin.Context) {
form := &struct {
api.TenantIDStringForm
Title string `json:"title" form:"title"`
Contact string `json:"contact" form:"contact"`
api.PageForm
}{}
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
return
}
data, err := activity.NewApply()(api.GetSession()(c).(*session.Admin)).Instance(form.Convert(), form.Title,
form.Contact, form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
func (*Activity) ApplyDetail(c *gin.Context) {
form := new(api.IDStringForm)
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
return
}
data, err := activity.NewApply()(api.GetSession()(c).(*session.Admin)).Detail(form.Convert())
api.APIResponse(err, data)(c)
}
func (*Activity) ApplyHandle(c *gin.Context) {
form := &struct {
api.IDStringForm
Remark string `json:"remark" form:"remark"`
}{}
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
return
}
err := activity.NewApply()(api.GetSession()(c).(*session.Admin)).Handle(form.Convert(), form.Remark)
api.APIResponse(err)(c)
}
func (*Activity) ApplyDelete(c *gin.Context) {
form := new(api.IDStringForm)
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
return
}
data, err := activity.NewApply()(api.GetSession()(c).(*session.Admin)).Detail(form.Convert())
api.APIResponse(err, data)(c)
}

12
app/api/admin/api/config.go
View File

@ -47,15 +47,3 @@ func (a *Config) Edit(c *gin.Context) {
err := controller.NewConfig()().Form(form.Params)
api.APIResponse(err)
}
func (a *Config) Area(c *gin.Context) {
form := &struct {
Code string `json:"code" form:"code"`
}{}
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
return
}
data := controller.NewConfig()().Area(form.Code)
api.APIResponse(nil, data)(c)
}

21
app/api/admin/api/service.go
View File

@ -13,15 +13,15 @@ func (*Service) Innovate(c *gin.Context) {
form := &struct {
api.TenantIDStringForm
Title string `json:"title" form:"title"`
KindID uint64 `json:"kind_id" form:"kind_id"`
KindID string `json:"kind_id" form:"kind_id"`
api.PageForm
}{}
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
return
}
data, err := service.NewInnovate()(api.GetSession()(c).(*session.Admin)).Instance(form.Convert(), form.Title, form.KindID,
form.Page, form.PageSize)
data, err := service.NewInnovate()(api.GetSession()(c).(*session.Admin)).Instance(form.Convert(), form.Title,
(&api.IDStringForm{ID: form.KindID}).Convert(), form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -40,11 +40,12 @@ func (*Service) InnovateForm(c *gin.Context) {
form := &struct {
api.IDStringForm
api.TenantIDStringForm
KindID string `json:"kind_id" form:"kind_id" binding:"required"`
Title string `json:"title" form:"title" binding:"required"`
Content string `json:"content" form:"content" binding:"required"`
Tags []string `json:"tags" form:"tags"`
Sort int `json:"sort" form:"sort"`
KindID string `json:"kind_id" form:"kind_id" binding:"required"`
Title string `json:"title" form:"title" binding:"required"`
Description string `json:"description" form:"description"`
Content string `json:"content" form:"content" binding:"required"`
Tags []string `json:"tags" form:"tags"`
Sort int `json:"sort" form:"sort"`
}{}
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
@ -52,8 +53,8 @@ func (*Service) InnovateForm(c *gin.Context) {
}
err := service.NewInnovate()(api.GetSession()(c).(*session.Admin)).Form(&service.InnovateParams{
ID: form.IDStringForm.Convert(), TenantID: form.TenantIDStringForm.Convert(),
KindID: (&api.IDStringForm{ID: form.KindID}).Convert(),
Title: form.Title, Content: form.Content, Tags: form.Tags, Sort: form.Sort,
KindID: (&api.IDStringForm{ID: form.KindID}).Convert(), Title: form.Title, Description: form.Description,
Content: form.Content, Tags: form.Tags, Sort: form.Sort,
})
api.APIResponse(err)(c)
}

145
app/api/admin/controller/activity/apply.go Normal file
View File

@ -0,0 +1,145 @@
package activity
import (
"SciencesServer/app/api/admin/model"
"SciencesServer/app/basic/controller"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/session"
"SciencesServer/serve/orm"
"errors"
"gorm.io/gorm"
"time"
)
type Apply struct {
*session.Admin
}
type ApplyHandle func(session *session.Admin) *Apply
type (
// ApplyInfo 申请信息
ApplyInfo struct {
ID string `json:"id"`
TenantID string `json:"tenant_id"`
*model.ActivityApplyInfo
Area string `json:"area"`
}
// ApplyDetailInfo 申请详细信息
ApplyDetailInfo struct {
ID string `json:"id"`
TenantID string `json:"tenant_id"`
*model.ActivityApplyInfo
}
)
// Instance 申请信息
func (c *Apply) Instance(tenantID uint64, title, contact string, page, pageSize int) (*controller.ReturnPages, error) {
mActivityApply := model.NewActivityApply()
where := make([]*model2.ModelWhere, 0)
if c.TenantID > 0 {
where = append(where, model2.NewWhere("a.tenant_id", c.TenantID))
}
if tenantID > 0 {
where = append(where, model2.NewWhere("a.tenant_id", tenantID))
}
if title != "" {
where = append(where, model2.NewWhereLike("a.title", title))
}
if contact != "" {
where = append(where, model2.NewWhereLike("a.contact", title))
}
var count int64
out, err := mActivityApply.Apply(page, pageSize, &count, where...)
if err != nil {
return nil, err
}
list := make([]*ApplyInfo, 0)
for _, v := range out {
list = append(list, &ApplyInfo{
ID: v.GetEncodeID(),
TenantID: v.GetEncodeTenantID(),
ActivityApplyInfo: v,
Area: v.FormatBasic(),
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
}
// Detail 详细信息
func (c *Apply) Detail(id uint64) (*ApplyDetailInfo, error) {
mActivityApply := model.NewActivityApply()
out, err := mActivityApply.Detail(id)
if err != nil {
return nil, err
}
return &ApplyDetailInfo{
ID: out.GetEncodeID(),
TenantID: out.GetEncodeTenantID(),
ActivityApplyInfo: out,
}, nil
}
// Handle 处理操作
func (c *Apply) Handle(id uint64, remark string) error {
mActivityApply := model.NewActivityApply()
mActivityApply.ID = id
isExist, err := model2.FirstField(mActivityApply.ActivityApply, []string{"id", "tenant_id", "status"})
if err != nil {
return err
} else if !isExist {
return errors.New("操作错误，活动申请信息不存在或已被删除")
}
if c.TenantID > 0 && mActivityApply.TenantID != c.TenantID {
return errors.New("操作错误，无权限操作")
}
if mActivityApply.Status != model2.ActivityApplyStatusForProcessing {
return errors.New("操作错误，活动申请信息状态发生变化，不可处理")
}
return orm.GetDB().Transaction(func(tx *gorm.DB) error {
mActivityApply.Status = model2.ActivityApplyStatusForProcessed
if err = model2.Updates(mActivityApply.ActivityApply, map[string]interface{}{
"status": model2.ActivityApplyStatusForProcessed, "updated_at": time.Now(),
}, tx); err != nil {
return err
}
mActivityApplyLog := model.NewActivityApplyLog()
mActivityApplyLog.ApplyID = mActivityApply.ID
mActivityApplyLog.Remark = remark
return model2.Create(mActivityApplyLog.ActivityApplyLog, tx)
})
}
// Delete 删除操作
func (c *Apply) Delete(id uint64) error {
mActivityApply := model.NewActivityApply()
mActivityApply.ID = id
isExist, err := model2.FirstField(mActivityApply.ActivityApply, []string{"id", "tenant_id", "status"})
if err != nil {
return err
} else if !isExist {
return errors.New("操作错误，活动申请信息不存在或已被删除")
}
if c.TenantID > 0 && mActivityApply.TenantID != c.TenantID {
return errors.New("操作错误，无权限操作")
}
return model2.Delete(mActivityApply.ActivityApply)
}
func NewApply() ApplyHandle {
return func(session *session.Admin) *Apply {
return &Apply{session}
}
}

140
app/api/admin/controller/activity/instance.go
View File

@ -2,10 +2,15 @@ package activity
import (
"SciencesServer/app/api/admin/model"
"SciencesServer/app/basic/config"
"SciencesServer/app/basic/controller"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/session"
"SciencesServer/serve/orm"
"SciencesServer/utils"
"errors"
"gorm.io/gorm"
"time"
)
type Instance struct {
@ -19,7 +24,8 @@ type (
InstanceInfo struct {
ID string `json:"id"`
*model.ActivityInstanceInfo
Area string `json:"area"`
Area string `json:"area"`
Industrys []string `json:"industrys"`
}
// InstanceDetailInfo 活动详细信息
InstanceDetailInfo struct {
@ -27,9 +33,30 @@ type (
TenantID string `json:"tenant_id"`
*model2.ActivityInstance
}
// InstanceParams 活动参数信息
InstanceParams struct {
ID, ApplyID, TenantID uint64
Title, Contact, ContactMobile, Image, Content string
BeginAt, FinishAt, JoinDeadline string
config.Area
Industrys []string
Amount float64
MaxNumber, NotifyCrowd, IsHome, Sort, Status int
}
// InstanceJoinInfo 活动报名信息
InstanceJoinInfo struct {
ID string `json:"id"`
*model.ActivityJoinInfo
}
)
func (c *Instance) Index(tenantID uint64, title string, page, pageSize int) (*controller.ReturnPages, error) {
// notify 执行通知
func (c *Instance) notify() {
}
// Index 活动信息
func (c *Instance) Index(tenantID uint64, title, contact, contactMobile string, page, pageSize int) (*controller.ReturnPages, error) {
mActivityInstance := model.NewActivityInstance()
where := make([]*model2.ModelWhere, 0)
@ -43,6 +70,12 @@ func (c *Instance) Index(tenantID uint64, title string, page, pageSize int) (*co
if title != "" {
where = append(where, model2.NewWhereLike("a.title", title))
}
if contact != "" {
where = append(where, model2.NewWhereLike("a.contact", title))
}
if contactMobile != "" {
where = append(where, model2.NewWhereLike("a.contact_mobile", title))
}
var count int64
out, err := mActivityInstance.Activity(page, pageSize, &count, where...)
@ -57,6 +90,7 @@ func (c *Instance) Index(tenantID uint64, title string, page, pageSize int) (*co
ID: v.GetEncodeID(),
ActivityInstanceInfo: v,
Area: v.FormatBasic(),
Industrys: v.GetIndustryAttribute(),
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
@ -81,10 +115,90 @@ func (c *Instance) Detail(id uint64) (*InstanceDetailInfo, error) {
}, nil
}
func (c *Instance) Form() {
// Form 数据操作
func (c *Instance) Form(params *InstanceParams) error {
mActivityInstance := model.NewActivityInstance()
if params.ID > 0 {
mActivityInstance.ID = params.ID
isExist, err := model2.FirstField(mActivityInstance.ActivityInstance, []string{"id", "tenant_id", "created_at"})
if err != nil {
return err
} else if !isExist {
return errors.New("操作错误，活动信息不存在或已被删除")
}
if c.TenantID > 0 && mActivityInstance.TenantID != c.TenantID {
return errors.New("操作错误，无权限操作")
}
}
mActivityInstance.Title = params.Title
mActivityInstance.Contact = params.Contact
mActivityInstance.BeginAt = utils.DateTimeToTime(params.BeginAt)
mActivityInstance.FinishAt = utils.DateTimeToTime(params.FinishAt)
mActivityInstance.JoinDeadline = utils.DateTimeToTime(params.JoinDeadline)
mActivityInstance.Area = model2.Area{
Province: params.Province, City: params.City, District: params.District, Address: params.Address,
}
mActivityInstance.Image.Image = params.Image
mActivityInstance.SetIndustryAttribute(params.Industrys)
mActivityInstance.Amount = params.Amount
mActivityInstance.MaxNumber = params.MaxNumber
mActivityInstance.NotifyCrowd = params.NotifyCrowd
mActivityInstance.IsHome = params.IsHome
mActivityInstance.Sort = params.Sort
mActivityInstance.Status = model2.ActivityInstanceStatus(params.Status)
if mActivityInstance.ID > 0 {
if c.TenantID <= 0 {
mActivityInstance.TenantID = params.TenantID
}
return model2.Updates(mActivityInstance.ActivityInstance, mActivityInstance.ActivityInstance)
}
return orm.GetDB().Transaction(func(tx *gorm.DB) error {
mActivityInstance.TenantID = params.TenantID
if c.TenantID > 0 {
mActivityInstance.TenantID = c.TenantID
}
err := model2.Create(mActivityInstance.ActivityInstance)
if err != nil {
return err
}
if params.ApplyID > 0 {
mActivityApply := model.NewActivityApply()
mActivityApply.ID = params.ApplyID
isExist := false
if isExist, err = model2.FirstField(mActivityApply.ActivityApply, []string{"id", "tenant_id", "status"}); err != nil {
return err
} else if !isExist {
return errors.New("操作错误，活动申请信息不存在或已被删除")
}
if c.TenantID > 0 && mActivityApply.TenantID != c.TenantID {
return errors.New("操作错误，无权限操作")
}
if mActivityApply.Status != model2.ActivityApplyStatusForProcessing {
return errors.New("操作错误，活动申请信息状态发生变化，不可处理")
}
if err = model2.Updates(mActivityApply.ActivityApply, map[string]interface{}{
"status": model2.ActivityApplyStatusForProcessed, "updated_at": time.Now(),
}, tx); err != nil {
return err
}
mActivityApplyLog := model.NewActivityApplyLog()
mActivityApplyLog.ApplyID = mActivityApply.ID
mActivityApplyLog.Remark = "创建活动"
return model2.Create(mActivityApplyLog.ActivityApplyLog, tx)
}
return nil
})
}
// Delete 删除操作
func (c *Instance) Delete(id uint64) error {
mActivityInstance := model.NewActivityInstance()
mActivityInstance.ID = id
@ -102,6 +216,26 @@ func (c *Instance) Delete(id uint64) error {
return model2.Delete(mActivityInstance.ActivityInstance)
}
func (c *Instance) Joins(activityID uint64, page, pageSize int) (*controller.ReturnPages, error) {
mActivityJoin := model.NewActivityJoin()
var count int64
out, err := mActivityJoin.Join(page, pageSize, &count, model2.NewWhere("j.activity_id", activityID))
if err != nil {
return nil, err
}
list := make([]*InstanceJoinInfo, 0)
for _, v := range out {
list = append(list, &InstanceJoinInfo{
ID: v.GetEncodeID(),
ActivityJoinInfo: v,
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
}
func NewInstance() InstanceHandle {
return func(session *session.Admin) *Instance {
return &Instance{session}

15
app/api/admin/controller/service/innovate.go
View File

@ -23,17 +23,18 @@ type (
}
// InnovateDetail 服务详细信息
InnovateDetail struct {
ID string `json:"id"`
ID string `json:"id"`
TenantID string `json:"tenant_id"`
*model2.ServiceInnovate
KindID string `json:"kind_id"`
Tags []string `json:"tags"`
}
// InnovateParams 服务参数信息
InnovateParams struct {
ID, TenantID, KindID uint64
Title, Content string
Tags []string
Sort int
ID, TenantID, KindID uint64
Title, Description, Content string
Tags []string
Sort int
}
// InnovateKindInfo 服务分类信息
InnovateKindInfo struct {
@ -71,7 +72,7 @@ func (c *Innovate) Instance(tenantID uint64, title string, kindID uint64, page,
where = append(where, model2.NewWhereLike("i.title", title))
}
if kindID > 0 {
where = append(where, model2.NewWhere("i.kind_id", kindID))
where = append(where, model2.NewWhere("k.id", kindID))
}
var count int64
@ -104,6 +105,7 @@ func (c *Innovate) Detail(id uint64) (*InnovateDetail, error) {
}
return &InnovateDetail{
ID: mServiceInnovate.GetEncodeID(),
TenantID: mServiceInnovate.GetEncodeTenantID(),
ServiceInnovate: mServiceInnovate.ServiceInnovate,
KindID: (&model2.Model{ID: mServiceInnovate.KindID}).GetEncodeID(),
Tags: mServiceInnovate.GetTagAttribute(),
@ -130,6 +132,7 @@ func (c *Innovate) Form(params *InnovateParams) error {
}
mServiceInnovate.KindID = params.KindID
mServiceInnovate.Title = params.Title
mServiceInnovate.Description = params.Description
mServiceInnovate.Content = params.Content
mServiceInnovate.SetTagAttribute(params.Tags)
mServiceInnovate.Sort = params.Sort

6
app/api/admin/controller/service/message.go
View File

@ -20,7 +20,8 @@ type MessageHandle func(session *session.Admin) *Message
type MessageInfo struct {
ID string `json:"id"`
*model.ServiceMessageInfo
Area string `json:"area"`
Area string `json:"area"`
AreaDomain string `json:"area_domain"`
}
// Instance 列表信息
@ -58,6 +59,7 @@ func (c *Message) Instance(tenantID uint64, name string, status int, content str
ID: v.GetEncodeID(),
ServiceMessageInfo: v,
Area: v.FormatBasic(),
AreaDomain: v.Domain,
})
}
return &controller.ReturnPages{Data: list, Count: count}, err
@ -91,7 +93,7 @@ func (c *Message) Handle(id uint64, content string) error {
mServiceMessageLog.MessageID = id
mServiceMessageLog.Content = content
if err = model2.Create(mServiceMessage.ServiceMessage, tx); err != nil {
if err = model2.Create(mServiceMessageLog.ServiceMessageLog, tx); err != nil {
return err
}
return nil

2
app/api/admin/controller/service/solution_case.go
View File

@ -188,7 +188,7 @@ func (c *SolutionCase) Kind(tenantID uint64, mode int, title string, page, pageS
where = append(where, model2.NewWhere("k.tenant_id", tenantID))
}
if mode > 0 {
where = append(where, model2.NewWhere("k.kind_id", mode))
where = append(where, model2.NewWhere("k.mode", mode))
}
if title != "" {
where = append(where, model2.NewWhereLike("k.title", title))

72
app/api/admin/model/activity_apply.go Normal file
View File

@ -0,0 +1,72 @@
package model
import (
"SciencesServer/app/common/model"
"SciencesServer/serve/orm"
"fmt"
"time"
)
type ActivityApply struct {
*model.ActivityApply
}
type (
// ActivityApplyInfo 详细信息
ActivityApplyInfo struct {
*model.ActivityApply
Username string `json:"username"`
model.Area
HandleUsername string `json:"handle_name"`
HandleRemark string `json:"handle_remark"`
HandleCreatedAt time.Time `json:"handle_created_at"`
}
)
// Apply 申请信息
func (m *ActivityApply) Apply(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*ActivityApplyInfo, error) {
db := orm.GetDB().Table(m.TableName()+" AS a").
Select("a.id", "a.tenant_id", "a.image", "a.title", "a.contact", "a.contact_mobile", "a.begin_at",
"a.finish_at", "a.amount", "a.max_number", "a.status", "a.created_at",
"t.province", "t.city", "l.name AS handle_name", "l.remark AS handle_remark", "l.created_at AS handle_created_at").
Joins(fmt.Sprintf("LEFT JOIN %s AS u ON a.uid = u.uuid", model.NewUserInstance().TableName())).
Joins(fmt.Sprintf("LEFT JOIN %s AS t ON i.tenant_id = t.id", model.NewSysTenant().TableName())).
Joins(fmt.Sprintf("LEFT JOIN (SELECT a.apply_id, MAX(a.id) AS id, MAX(a.created_at) AS created_at, MAX(a.remark) AS remark "+
"MAX(u.`name`) AS name FROM %s AS a LEFT JOIN %s ON a.uid = u.uuid WHERE a.is_deleted = %d GROUP BY a.apply_id) AS l ON a.id = l.apply_id",
model.NewActivityApplyLog().TableName(), model.NewSysUser().TableName(), model.DeleteStatusForNot)).
Where("a.is_deleted = ?", model.DeleteStatusForNot)
if len(where) > 0 {
for _, v := range where {
db = db.Where(v.Condition, v.Value)
}
}
out := make([]*ActivityApplyInfo, 0)
if err := db.Count(count).Error; err != nil {
return nil, err
}
if err := db.Order("a.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
// Detail 详细信息
func (m *ActivityApply) Detail(id uint64) (*ActivityApplyInfo, error) {
db := orm.GetDB().Table(m.TableName()+" AS a").
Select("a.*", "u.name AS username").
Joins(fmt.Sprintf("LEFT JOIN %s AS u ON a.uid = u.uuid", model.NewUserInstance().TableName())).
Where("a.id = ?", id)
out := new(ActivityApplyInfo)
err := db.Scan(out).Error
return out, err
}
func NewActivityApply() *ActivityApply {
return &ActivityApply{model.NewActivityApply()}
}

11
app/api/admin/model/activity_apply_log.go Normal file
View File

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

5
app/api/admin/model/activity_instance.go
View File

@ -19,8 +19,9 @@ type ActivityInstanceInfo struct {
// Activity 活动信息
func (m *ActivityInstance) Activity(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*ActivityInstanceInfo, error) {
db := orm.GetDB().Table(m.TableName()+" AS a").
Select("a.id", "a.tenant_id", "a.mode", "a.image", "a.title", "a.begin_at", "a.finish_at", "a.join_deadline",
"a.amount", "a.max_number", "a.status", "a.created_at", "j.count AS join_count", "t.province", "t.city").
Select("a.id", "a.tenant_id", "a.image", "a.title", "a.contact", "a.contact_mobile", "a.begin_at",
"a.finish_at", "a.join_deadline", "a.amount", "a.max_number", "a.status", "a.created_at", "j.count AS join_count",
"t.province", "t.city").
Joins(fmt.Sprintf("LEFT JOIN (SELECT activity_id, COUNT(id) AS count FROM %s WHERE is_delete = %d AND status = %d GROUP BY activity_id) AS j ON a.id = j.activity_id",
model.NewActivityJoin().TableName(), model.DeleteStatusForNot, model.ActivityJoinStatusForSuccess)).
Joins(fmt.Sprintf("LEFT JOIN %s AS t ON i.tenant_id = t.id", model.NewSysTenant().TableName())).

36
app/api/admin/model/activity_join.go
View File

@ -1,11 +1,45 @@
package model
import "SciencesServer/app/common/model"
import (
"SciencesServer/app/common/model"
"SciencesServer/serve/orm"
"fmt"
"time"
)
type ActivityJoin struct {
*model.ActivityJoin
}
type ActivityJoinInfo struct {
model.Model
Name string `json:"name"`
CreatedAt time.Time `json:"created_at"`
}
func (m *ActivityJoin) Join(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*ActivityJoinInfo, error) {
db := orm.GetDB().Table(m.TableName()+" AS j").
Select("j.id", "u.name", "j.created_at").
Joins(fmt.Sprintf("LEFT JOIN %s AS u ON j.uid = u.uuid", model.NewUserInstance().TableName())).
Where("j.is_deleted = ?", model.DeleteStatusForNot).
Where("j.status = ?", model.ActivityJoinStatusForSuccess)
if len(where) > 0 {
for _, v := range where {
db = db.Where(v.Condition, v.Value)
}
}
out := make([]*ActivityJoinInfo, 0)
if err := db.Count(count).Error; err != nil {
return nil, err
}
if err := db.Order("j.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
func NewActivityJoin() *ActivityJoin {
return &ActivityJoin{model.NewActivityJoin()}
}

2
app/api/admin/model/service_innovate.go
View File

@ -26,7 +26,7 @@ func (m *ServiceInnovate) Innovate(page, pageSize int, count *int64, where ...*m
Select("i.id", "i.title", "t.name AS tenant_name", "k.title AS kind_title", "i.sort", "i.created_at",
"t.province", "t.city").
Joins(fmt.Sprintf("LEFT JOIN %s AS t ON i.tenant_id = t.id", model.NewSysTenant().TableName())).
Joins(fmt.Sprintf("LEFT JOIN %s AS k ON i.kind = k.id", model.NewServiceInnovateKind().TableName())).
Joins(fmt.Sprintf("LEFT JOIN %s AS k ON i.kind_id = k.id", model.NewServiceInnovateKind().TableName())).
Where("i.is_deleted = ?", model.DeleteStatusForNot)
if len(where) > 0 {

6
app/api/admin/model/service_message.go
View File

@ -14,6 +14,7 @@ type ServiceMessage struct {
type ServiceMessageInfo struct {
*model.ServiceMessage
model.Area
Domain string `json:"-"`
HandleContent string `json:"handle_content"`
HandleCreatedAt time.Time `json:"handle_created_at"`
}
@ -21,11 +22,12 @@ type ServiceMessageInfo struct {
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").
"t.province", "t.city", "t.domain").
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()))
Joins(fmt.Sprintf("LEFT JOIN %s AS t ON m.tenant_id = t.id", model.NewSysTenant().TableName())).
Where("m.is_deleted = ?", model.DeleteStatusForNot)
if len(where) > 0 {
for _, v := range where {

2
app/api/admin/model/sys_auth.go
View File

@ -29,7 +29,7 @@ func (m *SysAuth) TenantAuth(tenantID uint64) ([]*SysAuthScene, error) {
out := make([]*SysAuthScene, 0)
db := orm.GetDB().Table(m.TableName()+" AS a").
Select("a.id", "a.parent_id", "a.kind", "a.name", "r_a.id AS scene_id").
Select("a.id", "a.parent_id", "a.kind", "a.name", "t_a.id AS scene_id").
Joins(fmt.Sprintf("LEFT JOIN %s AS t_a ON t_a.auth_id = a.id AND t_a.tenant_id = %d AND t_a.is_deleted = %d",
model.NewSysTenantAuth().TableName(), tenantID, model.DeleteStatusForNot)).
Where("a.is_deleted = ?", model.DeleteStatusForNot)