feat：完善活动信息

app/api/enterprise/api/activity.go

@@ -0,0 +1,98 @@
+package api
+
+import (
+	"SciencesServer/app/api/enterprise/controller/activity"
+	"SciencesServer/app/basic/api"
+	"SciencesServer/app/session"
+	"github.com/gin-gonic/gin"
+)
+
+type Activity struct{}
+
+func (*Activity) Applys(c *gin.Context) {
+	form := &struct {
+		Title string `json:"title" form:"title"`
+		api.PageForm
+	}{}
+	if err := api.Bind(form)(c); err != nil {
+		api.APIFailure(err.(error))(c)
+		return
+	}
+	data, err := activity.NewApply()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)).
+		List(form.Title, form.Page, form.PageSize)
+	api.APIResponse(err, data)(c)
+}
+
+func (*Activity) ApplyLaunch(c *gin.Context) {
+	form := &struct {
+		Mode         int    `json:"mode" form:"mode" binding:"required"`
+		Title        string `json:"title" form:"title" binding:"required"`
+		Content      string `json:"content" form:"content"`
+		MaxNumber    int    `json:"max_number" form:"max_number"`
+		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"`
+		api.PageForm
+	}{}
+	if err := api.Bind(form)(c); err != nil {
+		api.APIFailure(err.(error))(c)
+		return
+	}
+	err := activity.NewApply()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)).
+		Launch(&activity.ApplyLaunchParams{
+			Mode: form.Mode, MaxNUmber: form.MaxNumber, Title: form.Title, Content: form.Content,
+			BeginAt: form.BeginAt, FinishAt: form.FinishAt, JoinDeadline: form.JoinDeadline,
+		})
+	api.APIResponse(err)(c)
+}
+
+func (*Activity) ApplyRevoke(c *gin.Context) {
+	form := new(api.IDStringForm)
+
+	if err := api.Bind(form)(c); err != nil {
+		api.APIFailure(err.(error))(c)
+		return
+	}
+	err := activity.NewApply()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)).
+		Revoke(form.Convert())
+	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
+	}
+	err := activity.NewApply()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)).
+		Delete(form.Convert())
+	api.APIResponse(err)(c)
+}
+
+func (*Activity) Joins(c *gin.Context) {
+	form := &struct {
+		Title  string `json:"title" form:"title"`
+		Status int    `json:"status" form:"status"` // 1：未开始，2：进行中，3：已结束
+		api.PageForm
+	}{}
+	if err := api.Bind(form)(c); err != nil {
+		api.APIFailure(err.(error))(c)
+		return
+	}
+	data, err := activity.NewInstance()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)).
+		Joins(form.Title, form.Status, form.Page, form.PageSize)
+	api.APIResponse(err, data)(c)
+}
+
+func (*Activity) JoinDelete(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.Enterprise), api.GetLocal()(c).(string)).
+		JoinDelete(form.Convert())
+	api.APIResponse(err)(c)
+}

app/api/enterprise/controller/activity/apply.go

@@ -0,0 +1,110 @@
+package activity
+
+import (
+	"SciencesServer/app/api/enterprise/model"
+	"SciencesServer/app/basic/controller"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/session"
+	"SciencesServer/utils"
+	"errors"
+	"time"
+)
+
+type Apply struct {
+	*session.Enterprise
+	local string
+}
+
+type ApplyHandle func(session *session.Enterprise, local string) *Apply
+
+type (
+	// ApplyLaunchParams 参数信息
+	ApplyLaunchParams struct {
+		Mode, MaxNUmber                 int
+		Title, Content                  string
+		BeginAt, FinishAt, JoinDeadline string
+	}
+)
+
+// List 列表信息
+func (c *Apply) List(title string, page, pageSize int) (*controller.ReturnPages, error) {
+	mActivityApply := model.NewActivityApply()
+
+	out := make([]*model2.ActivityApply, 0)
+
+	where := []*model2.ModelWhereOrder{
+		&model2.ModelWhereOrder{
+			Where: model2.NewWhere("local", c.local),
+			Order: model2.NewOrder("id", model2.OrderModeToDesc),
+		},
+		&model2.ModelWhereOrder{
+			Where: model2.NewWhere("m_uid", c.UID),
+		},
+	}
+	if title != "" {
+		where = append(where, &model2.ModelWhereOrder{
+			Where: model2.NewWhereLike("title", title),
+		})
+	}
+	//if status > 0 {
+	//	where = append(where, &model2.ModelWhereOrder{
+	//		Where: model2.NewWhere("status", status),
+	//	})
+	//}
+	var count int64
+
+	if err := model2.Pages(mActivityApply.ActivityApply, &out, page, pageSize, &count, where...); err != nil {
+		return nil, err
+	}
+	return &controller.ReturnPages{Data: out, Count: count}, nil
+}
+
+// Launch 发起操作
+func (c *Apply) Launch(params *ApplyLaunchParams) error {
+	mActivityApply := model.NewActivityApply()
+	mActivityApply.Local.Local = c.local
+	mActivityApply.MUid = c.ManageUID
+	mActivityApply.Mode = model2.ActivityInstanceMode(params.Mode)
+	mActivityApply.Title = params.Title
+	mActivityApply.Content = params.Content
+	mActivityApply.MaxNumber = params.MaxNUmber
+	mActivityApply.BeginAt = utils.DateTimeToTime(params.BeginAt)
+	mActivityApply.FinishAt = utils.DateTimeToTime(params.FinishAt)
+	mActivityApply.JoinDeadline = utils.DateTimeToTime(params.JoinDeadline)
+	return model2.Create(mActivityApply.ActivityApply)
+}
+
+// Revoke 撤销操作
+func (c *Apply) Revoke(id uint64) error {
+	mActivityApply := model.NewActivityApply()
+	mActivityApply.ID = id
+
+	isExist, err := model2.FirstField(mActivityApply.ActivityApply, []string{"id", "status"})
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("操作错误，活动信息不存在或已被删除")
+	} else if mActivityApply.Status != model2.ActivityApplyStatusForExamining {
+		return errors.New("操作错误，当前活动状态易发生变化，不可撤销")
+	}
+	return model2.Updates(mActivityApply.ActivityApply, map[string]interface{}{
+		"status": model2.ActivityApplyStatusForRevoke, "updated_at": time.Now(),
+	})
+}
+
+// Delete 删除操作
+func (c *Apply) Delete(id uint64) error {
+	mActivityApply := model.NewActivityApply()
+	mActivityApply.ID = id
+	return model2.Delete(mActivityApply.ActivityApply)
+}
+
+func NewApply() ApplyHandle {
+	return func(session *session.Enterprise, local string) *Apply {
+		return &Apply{
+			Enterprise: session,
+			local:      local,
+		}
+	}
+}

app/api/enterprise/controller/activity/instance.go

@@ -0,0 +1,79 @@
+package activity
+
+import (
+	"SciencesServer/app/api/enterprise/model"
+	"SciencesServer/app/basic/controller"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/session"
+	"time"
+)
+
+type Instance struct {
+	*session.Enterprise
+	local string
+}
+
+type InstanceHandle func(session *session.Enterprise, local string) *Instance
+
+type InstanceForJoin struct {
+	*model.ActivityInstanceJoinInfo
+	ID string `json:"id"`
+}
+
+// Joins 活动参加信息
+func (c *Instance) Joins(title string, status, page, pageSize int) (*controller.ReturnPages, error) {
+	mActivityInstance := model.NewActivityInstance()
+
+	where := []*model2.ModelWhere{
+		model2.NewWhere("a.local", c.local),
+		model2.NewWhere("a.identity", c.Identity),
+		model2.NewWhere("j.m_uid", c.UID),
+	}
+
+	if title != "" {
+		where = append(where, model2.NewWhereLike("a.title", title))
+	}
+	if status > 0 {
+		now := time.Now()
+
+		if status == 1 { // 未开始
+			where = append(where, model2.NewWhereCondition("a.begin_at", ">", now))
+		} else if status == 2 { // 进行中
+			where = append(where, model2.NewWhereCondition("a.begin_at", "<=", now),
+				model2.NewWhereCondition("a.finish_at", ">=", now))
+		} else { // 已结束
+			where = append(where, model2.NewWhereCondition("a.finish_at", "<", now))
+		}
+	}
+	var count int64
+
+	out, err := mActivityInstance.Joins(page, pageSize, &count, where...)
+
+	if err != nil {
+		return nil, err
+	}
+	list := make([]*InstanceForJoin, 0)
+
+	for _, v := range out {
+		mActivityInstance.SetID(v.ID)
+
+		list = append(list, &InstanceForJoin{
+			ID:                       mActivityInstance.GetEncodeID(),
+			ActivityInstanceJoinInfo: v,
+		})
+	}
+	return &controller.ReturnPages{Data: out, Count: count}, err
+}
+
+// JoinDelete 活动参加信息删除
+func (c *Instance) JoinDelete(id uint64) error {
+	mActivityJoin := model.NewActivityJoin()
+	mActivityJoin.ID = id
+	return model2.Delete(mActivityJoin.ActivityJoin)
+}
+
+func NewInstance() InstanceHandle {
+	return func(session *session.Enterprise, local string) *Instance {
+		return &Instance{Enterprise: session, local: local}
+	}
+}

app/api/enterprise/model/activity_apply.go

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

app/api/enterprise/model/activity_instance.go

@@ -0,0 +1,47 @@
+package model
+
+import (
+	"SciencesServer/app/common/model"
+	"SciencesServer/serve/orm"
+	"fmt"
+	"time"
+)
+
+type ActivityInstance struct {
+	*model.ActivityInstance
+}
+
+// ActivityInstanceJoinInfo 活动报名信息
+type ActivityInstanceJoinInfo struct {
+	ID uint64 `json:"id"`
+	*model.ActivityInstanceBasic
+	CreatedAt time.Time `json:"created_at"`
+}
+
+// Joins 活动参加信息
+func (m *ActivityInstance) Joins(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*ActivityInstanceJoinInfo, error) {
+	db := orm.GetDB().Table(model.NewActivityJoin().TableName()+" AS j").
+		Select("j.id", "a.title", "a.begin_at", "a.finish_at", "a.join_deadline", "j.created_at").
+		Joins(fmt.Sprintf("LEFT JOIN %s AS a ON j.activity_id = a.id", m.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([]*ActivityInstanceJoinInfo, 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 NewActivityInstance() *ActivityInstance {
+	return &ActivityInstance{model.NewActivityInstance()}
+}

app/api/enterprise/model/activity_join.go

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