feat:完善项目信息

This commit is contained in:
henry
2022-01-13 10:14:02 +08:00
parent a15f0fff2b
commit e3909112ce
9 changed files with 40 additions and 36 deletions

View File

@ -10,6 +10,7 @@ import (
"SciencesServer/utils"
"errors"
"gorm.io/gorm"
"strings"
"time"
)
@ -24,14 +25,15 @@ type (
InstanceInfo struct {
ID string `json:"id"`
*model.ActivityInstanceInfo
Area string `json:"area"`
Industrys []string `json:"industrys"`
Area string `json:"area"`
Industry string `json:"industry"`
}
// InstanceDetailInfo 活动详细信息
InstanceDetailInfo struct {
ID string `json:"id"`
TenantID string `json:"tenant_id"`
*model2.ActivityInstance
Industrys []string `json:"industrys"`
}
// InstanceParams 活动参数信息
InstanceParams struct {
@ -86,11 +88,16 @@ func (c *Instance) Index(tenantID uint64, title, contact, contactMobile string,
list := make([]*InstanceInfo, 0)
for _, v := range out {
_industry := make([]string, 0)
for _, v := range v.GetIndustryAttribute() {
_industry = append(_industry, config.GetIndustryInfo(v, "-"))
}
list = append(list, &InstanceInfo{
ID: v.GetEncodeID(),
ActivityInstanceInfo: v,
Area: v.FormatBasic(),
Industrys: v.GetIndustryAttribute(),
Industry: strings.Join(_industry, ""),
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
@ -112,6 +119,7 @@ func (c *Instance) Detail(id uint64) (*InstanceDetailInfo, error) {
ID: mActivityInstance.GetEncodeID(),
TenantID: mActivityInstance.GetEncodeTenantID(),
ActivityInstance: mActivityInstance.ActivityInstance,
Industrys: mActivityInstance.GetIndustryAttribute(),
}, nil
}
@ -135,6 +143,7 @@ func (c *Instance) Form(params *InstanceParams) error {
}
mActivityInstance.Title = params.Title
mActivityInstance.Contact = params.Contact
mActivityInstance.ContactMobile = params.ContactMobile
mActivityInstance.BeginAt = utils.DateTimeToTime(params.BeginAt)
mActivityInstance.FinishAt = utils.DateTimeToTime(params.FinishAt)
mActivityInstance.JoinDeadline = utils.DateTimeToTime(params.JoinDeadline)
@ -148,6 +157,7 @@ func (c *Instance) Form(params *InstanceParams) error {
mActivityInstance.NotifyCrowd = params.NotifyCrowd
mActivityInstance.IsHome = params.IsHome
mActivityInstance.Sort = params.Sort
mActivityInstance.Content = params.Content
mActivityInstance.Status = model2.ActivityInstanceStatus(params.Status)
if mActivityInstance.ID > 0 {