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

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))