feat：完善项目信息

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

@@ -0,0 +1,109 @@
+package activity
+
+import (
+	"SciencesServer/app/api/admin/model"
+	"SciencesServer/app/basic/controller"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/session"
+	"errors"
+)
+
+type Instance struct {
+	*session.Admin
+}
+
+type InstanceHandle func(session *session.Admin) *Instance
+
+type (
+	// InstanceInfo 活动信息
+	InstanceInfo struct {
+		ID string `json:"id"`
+		*model.ActivityInstanceInfo
+		Area string `json:"area"`
+	}
+	// InstanceDetailInfo 活动详细信息
+	InstanceDetailInfo struct {
+		ID       string `json:"id"`
+		TenantID string `json:"tenant_id"`
+		*model2.ActivityInstance
+	}
+)
+
+func (c *Instance) Index(tenantID uint64, title string, page, pageSize int) (*controller.ReturnPages, error) {
+	mActivityInstance := model.NewActivityInstance()
+
+	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))
+	}
+	var count int64
+
+	out, err := mActivityInstance.Activity(page, pageSize, &count, where...)
+
+	if err != nil {
+		return nil, err
+	}
+	list := make([]*InstanceInfo, 0)
+
+	for _, v := range out {
+		list = append(list, &InstanceInfo{
+			ID:                   v.GetEncodeID(),
+			ActivityInstanceInfo: v,
+			Area:                 v.FormatBasic(),
+		})
+	}
+	return &controller.ReturnPages{Data: list, Count: count}, nil
+}
+
+// Detail 详细信息
+func (c *Instance) Detail(id uint64) (*InstanceDetailInfo, error) {
+	mActivityInstance := model.NewActivityInstance()
+	mActivityInstance.ID = id
+
+	isExist, err := model2.First(mActivityInstance.ActivityInstance)
+
+	if err != nil {
+		return nil, err
+	} else if !isExist {
+		return nil, errors.New("操作错误，活动信息不存在或已被删除")
+	}
+	return &InstanceDetailInfo{
+		ID:               mActivityInstance.GetEncodeID(),
+		TenantID:         mActivityInstance.GetEncodeTenantID(),
+		ActivityInstance: mActivityInstance.ActivityInstance,
+	}, nil
+}
+
+func (c *Instance) Form() {
+
+}
+
+func (c *Instance) Delete(id uint64) error {
+	mActivityInstance := model.NewActivityInstance()
+	mActivityInstance.ID = id
+
+	isExist, err := model2.FirstField(mActivityInstance.ActivityInstance, []string{"id", "tenant_id"})
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("操作错误，活动信息不存在或已被删除")
+	}
+	if c.TenantID > 0 && c.TenantID != mActivityInstance.TenantID {
+		return errors.New("操作错误，无权限操作")
+	}
+	return model2.Delete(mActivityInstance.ActivityInstance)
+}
+
+func NewInstance() InstanceHandle {
+	return func(session *session.Admin) *Instance {
+		return &Instance{session}
+	}
+}

app/api/admin/controller/service/innovate.go

@@ -143,7 +143,6 @@ func (c *Innovate) Form(params *InnovateParams) error {
 // Delete 删除操作
 func (c *Innovate) Delete(id uint64) error {
 	mServiceInnovate := model.NewServiceInnovate()
-
 	mServiceInnovate.ID = id
 
 	isExist, err := model2.FirstField(mServiceInnovate.ServiceInnovate, []string{"id", "tenant_id"})
@@ -199,11 +198,15 @@ func (c *Innovate) KindSelect() ([]*InnovateKindSelectInfo, error) {
 	out := make([]*model2.ServiceInnovateKind, 0)
 
 	where := []*model2.ModelWhereOrder{&model2.ModelWhereOrder{
-		Where: model2.NewWhere("tenant_id", c.TenantID),
 		Order: model2.NewOrder("sort", model2.OrderModeToAsc),
 	}, &model2.ModelWhereOrder{
 		Order: model2.NewOrder("id", model2.OrderModeToDesc),
 	}}
+	if c.TenantID > 0 {
+		where = append(where, &model2.ModelWhereOrder{
+			Where: model2.NewWhere("tenant_id", c.TenantID),
+		})
+	}
 	if err := model2.ScanFields(mServiceInnovateKind.ServiceInnovateKind, &out, []string{"id", "title"}, where...); err != nil {
 		return nil, err
 	}

app/api/admin/controller/service/message.go

@@ -91,13 +91,33 @@ func (c *Message) Handle(id uint64, content string) error {
 		mServiceMessageLog.MessageID = id
 		mServiceMessageLog.Content = content
 
-		if err = model2.Create(mServiceMessage.ServiceMessage); err != nil {
+		if err = model2.Create(mServiceMessage.ServiceMessage, tx); err != nil {
 			return err
 		}
 		return nil
 	})
 }
 
+// Delete 删除操作
+func (c *Message) Delete(id uint64) error {
+	mServiceMessage := model.NewServiceMessage()
+	mServiceMessage.ID = id
+
+	isExist, err := model2.FirstField(mServiceMessage.ServiceMessage, []string{"id", "tenant_id", "status"})
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("操作错误，留言信息不存在或已被删除")
+	} else if c.TenantID > 0 && mServiceMessage.TenantID != c.TenantID {
+		return errors.New("操作错误，无权限操作")
+	}
+	if mServiceMessage.Status != model2.ServiceMessageStatusForProcessing {
+		return errors.New("操作错误，当前留言信息已处理")
+	}
+	return model2.Delete(mServiceMessage.ServiceMessage)
+}
+
 func NewMessage() MessageHandle {
 	return func(session *session.Admin) *Message {
 		return &Message{session}

app/api/admin/controller/service/solution_case.go

@@ -220,11 +220,16 @@ func (c *SolutionCase) KindSelect() (map[model2.ServiceSolutionCaseMode]*Solutio
 	mServiceSolutionCaseKind := model.NewServiceSolutionCaseKind()
 
 	where := []*model2.ModelWhereOrder{&model2.ModelWhereOrder{
-		Where: model2.NewWhere("tenant_id", c.TenantID),
 		Order: model2.NewOrder("sort", model2.OrderModeToAsc),
 	}, &model2.ModelWhereOrder{
 		Order: model2.NewOrder("id", model2.OrderModeToDesc),
 	}}
+
+	if c.TenantID > 0 {
+		where = append(where, &model2.ModelWhereOrder{
+			Where: model2.NewWhere("tenant_id", c.TenantID),
+		})
+	}
 	out := make([]*model2.ServiceSolutionCaseKind, 0)
 
 	if err := model2.ScanFields(mServiceSolutionCaseKind.ServiceSolutionCaseKind, &out, []string{"id", "mode", "title"}, where...); err != nil {