feat：完善项目

app/api/admin/api/service.go

@@ -269,3 +269,31 @@ func (*Service) MessageDelete(c *gin.Context) {
 	err := service.NewMessage()(api.GetSession()(c).(*session.Admin)).Delete(form.Convert())
 	api.APIResponse(err)(c)
 }
+
+func (*Service) Demand(c *gin.Context) {
+	form := &struct {
+		api.TenantIDStringForm
+		Title string `json:"title" form:"title"`
+		Kind  int    `json:"kind" form:"kind"`
+		api.PageForm
+	}{}
+	if err := api.Bind(form)(c); err != nil {
+		api.APIFailure(err.(error))(c)
+		return
+	}
+	data, err := service.NewDemand()(api.GetSession()(c).(*session.Admin)).Instance(form.TenantIDStringForm.Convert(),
+		form.Title, form.Kind, form.Page, form.PageSize)
+	api.APIResponse(err, data)(c)
+}
+
+func (*Service) DemandDelete(c *gin.Context) {
+	form := &struct {
+		api.IDStringForm
+	}{}
+	if err := api.Bind(form)(c); err != nil {
+		api.APIFailure(err.(error))(c)
+		return
+	}
+	err := service.NewDemand()(api.GetSession()(c).(*session.Admin)).Delete(form.Convert())
+	api.APIResponse(err)(c)
+}

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

@@ -0,0 +1,84 @@
+package service
+
+import (
+	"SciencesServer/app/api/admin/model"
+	"SciencesServer/app/basic/controller"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/session"
+	"errors"
+)
+
+type Demand struct {
+	*session.Admin
+}
+
+type DemandHandle func(session *session.Admin) *Demand
+
+type (
+	// DemandInfo 需求信息
+	DemandInfo struct {
+		ID string `json:"id"`
+		*model.ServiceDemandInfo
+		Area string `json:"area"`
+	}
+)
+
+// Instance 首页信息
+func (c *Demand) Instance(tenantID uint64, title string, kind, page, pageSize int) (*controller.ReturnPages, error) {
+	mServiceDemand := model.NewServiceDemand()
+
+	where := make([]*model2.ModelWhere, 0)
+
+	if c.TenantID > 0 {
+		where = append(where, model2.NewWhere("d.tenant_id", c.TenantID))
+	}
+	if tenantID > 0 {
+		where = append(where, model2.NewWhere("d.tenant_id", tenantID))
+	}
+	if title != "" {
+		where = append(where, model2.NewWhereLike("d.title", title))
+	}
+	if kind > 0 {
+		where = append(where, model2.NewWhere("d.kind", kind))
+	}
+	var count int64
+
+	out, err := mServiceDemand.Demand(page, pageSize, &count, where...)
+
+	if err != nil {
+		return nil, err
+	}
+	list := make([]*DemandInfo, 0)
+
+	for _, v := range out {
+		list = append(list, &DemandInfo{
+			ID:                v.GetEncodeID(),
+			ServiceDemandInfo: v,
+			Area:              v.FormatBasic(),
+		})
+	}
+	return &controller.ReturnPages{Data: list, Count: count}, nil
+}
+
+// Delete 删除操作
+func (c *Demand) Delete(id uint64) error {
+	mServiceDemand := model.NewServiceDemand()
+	mServiceDemand.ID = id
+
+	isExist, err := model2.FirstField(mServiceDemand.ServiceDemand, []string{"id", "tenant_id"})
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("操作错误，需求信息不存在或已被删除")
+	} else if c.TenantID > 0 && mServiceDemand.TenantID != c.TenantID {
+		return errors.New("操作错误，无权限操作")
+	}
+	return model2.Delete(mServiceDemand.ServiceDemand)
+}
+
+func NewDemand() DemandHandle {
+	return func(session *session.Admin) *Demand {
+		return &Demand{session}
+	}
+}

app/api/admin/controller/technology/demand.go

@@ -0,0 +1,23 @@
+package technology
+
+import "SciencesServer/app/session"
+
+type Demand struct {
+	*session.Admin
+}
+
+type DemandHandle func(session *session.Admin) *Demand
+
+func (c *Demand) Instance(tenantID uint64, page, pageSize int) {
+
+}
+
+func (c *Demand) Delete() {
+
+}
+
+func NewDemand() DemandHandle {
+	return func(session *session.Admin) *Demand {
+		return &Demand{session}
+	}
+}

app/api/admin/model/service_demand.go

@@ -0,0 +1,47 @@
+package model
+
+import (
+	"SciencesServer/app/common/model"
+	"SciencesServer/serve/orm"
+	"fmt"
+)
+
+type ServiceDemand struct {
+	*model.ServiceDemand
+}
+
+type ServiceDemandInfo struct {
+	*model.ServiceDemand
+	model.Area
+}
+
+// Demand 需求信息
+func (m *ServiceDemand) Demand(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*ServiceDemandInfo, error) {
+	db := orm.GetDB().Table(m.TableName()+" AS d").
+		Select("d.*", "t.province", "t.city").
+		Joins(fmt.Sprintf("LEFT JOIN %s AS t ON ", model.NewSysTenant().TableName())).
+		Where("d.is_deleted = ?", model.DeleteStatusForNot).
+		Where("d.status IN (?)", []model.ServiceDemandStatus{
+			model.ServiceDemandStatusForPublish, model.ServiceDemandStatusForAcceptance,
+			model.ServiceDemandStatusForComplete,
+		})
+
+	if len(where) > 0 {
+		for _, v := range where {
+			db = db.Where(v.Condition, v.Value)
+		}
+	}
+	out := make([]*ServiceDemandInfo, 0)
+
+	if err := db.Count(count).Error; err != nil {
+		return nil, err
+	}
+	if err := db.Order("d.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func NewServiceDemand() *ServiceDemand {
+	return &ServiceDemand{model.NewServiceDemand()}
+}

app/api/admin/model/technology_demand.go

@@ -0,0 +1,12 @@
+package model
+
+import "SciencesServer/app/common/model"
+
+// TechnologyDemand 技术需求
+type TechnologyDemand struct {
+	*model.TechnologyDemand
+}
+
+func NewTechnologyDemand() *TechnologyDemand {
+	return &TechnologyDemand{model.NewTechnologyDemand()}
+}

router/address.go

@@ -301,6 +301,8 @@ func registerAdminAPI(app *gin.Engine) {
 		service.POST("/message", _api.Message)
 		service.POST("/message/handle", _api.MessageHandle)
 		service.POST("/message/delete", _api.MessageDelete)
+		service.POST("/demand", _api.Demand)
+		service.POST("/demand/delete", _api.DemandDelete)
 	}
 	// Technology 科技管理
 	technology := v1.Group("/technology")