feat：增加用户服务需求数据模型

app/api/enterprise/api/service.go

@@ -0,0 +1,91 @@
+package api
+
+import (
+	"SciencesServer/app/api/enterprise/controller/service"
+	"SciencesServer/app/basic/api"
+	"SciencesServer/app/session"
+	"github.com/gin-gonic/gin"
+)
+
+type Service struct{}
+
+type (
+	// demandServiceForm 服务需求信息
+	demandServiceForm struct {
+		Kinds       []int  `json:"kinds" form:"kinds"`
+		Title       string `json:"title" form:"title" binding:"required"`
+		Name        string `json:"name" form:"name" binding:"required"`
+		Mobile      string `json:"mobile" form:"mobile" binding:"required"`
+		Description string `json:"description" form:"description" binding:"required"`
+		IsSubmit    int    `json:"is_submit" form:"is_submit"`
+	}
+)
+
+func (*Service) Demand(c *gin.Context) {
+	form := &struct {
+		Title  string `json:"title" form:"title"`
+		Status int    `json:"status" form:"status"`
+		api.PageForm
+	}{}
+	if err := api.Bind(form)(c); err != nil {
+		api.APIFailure(err.(error))(c)
+		return
+	}
+	data, err := service.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)).
+		List(form.Title, form.Status, form.Page, form.PageSize)
+	api.APIResponse(err, data)(c)
+}
+
+func (*Service) DemandDetail(c *gin.Context) {
+	form := new(api.IDStringForm)
+
+	if err := api.Bind(form)(c); err != nil {
+		api.APIFailure(err.(error))(c)
+		return
+	}
+	data, err := service.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)).
+		Detail(form.Convert())
+	api.APIResponse(err, data)(c)
+}
+
+func (*Service) DemandAdd(c *gin.Context) {
+	form := new(demandServiceForm)
+
+	if err := api.Bind(form)(c); err != nil {
+		api.APIFailure(err.(error))(c)
+		return
+	}
+	err := service.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)).
+		Form(&service.DemandParams{Kinds: form.Kinds, IsSubmit: form.IsSubmit, Title: form.Title,
+			Name: form.Name, Mobile: form.Mobile, Description: form.Description,
+		})
+	api.APIResponse(err)(c)
+}
+
+func (*Service) DemandEdit(c *gin.Context) {
+	form := &struct {
+		api.IDStringForm
+		demandServiceForm
+	}{}
+	if err := api.Bind(form)(c); err != nil {
+		api.APIFailure(err.(error))(c)
+		return
+	}
+	err := service.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)).
+		Form(&service.DemandParams{ID: form.Convert(), Kinds: form.Kinds, IsSubmit: form.IsSubmit, Title: form.Title,
+			Name: form.Name, Mobile: form.Mobile, Description: form.Description,
+		})
+	api.APIResponse(err)(c)
+}
+
+func (*Service) DemandDelete(c *gin.Context) {
+	form := new(api.IDStringForm)
+
+	if err := api.Bind(form)(c); err != nil {
+		api.APIFailure(err.(error))(c)
+		return
+	}
+	err := service.NewDemand()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)).
+		Delete(form.Convert())
+	api.APIResponse(err)(c)
+}

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

@@ -0,0 +1,150 @@
+package service
+
+import (
+	"SciencesServer/app/api/enterprise/model"
+	"SciencesServer/app/basic/controller"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/session"
+	"errors"
+)
+
+type Demand struct {
+	*session.Enterprise
+	local string
+}
+
+type (
+	// DemandInfo 需求信息
+	DemandInfo struct {
+		ID string `json:"id"`
+		*model2.ServiceDemand
+		Kinds []int `json:"kinds"`
+	}
+	// DemandParams 需求参数信息
+	DemandParams struct {
+		ID                               uint64
+		Kinds                            []int
+		IsSubmit                         int
+		Title, Name, Mobile, Description string
+	}
+)
+
+type DemandHandle func(session *session.Enterprise, local string) *Demand
+
+// List 列表信息
+func (c *Demand) List(title string, status, page, pageSize int) (*controller.ReturnPages, error) {
+	mServiceDemand := model.NewServiceDemand()
+
+	where := []*model2.ModelWhereOrder{
+		&model2.ModelWhereOrder{
+			Where: model2.NewWhere("local", c.local),
+			Order: model2.NewOrder("id", model2.OrderModeToDesc),
+		},
+		&model2.ModelWhereOrder{Where: model2.NewWhere("uid", c.UID)},
+		&model2.ModelWhereOrder{Where: model2.NewWhere("status", status)},
+	}
+
+	if title != "" {
+		where = append(where, &model2.ModelWhereOrder{Where: model2.NewWhereLike("title", title)})
+	}
+	out := make([]*model2.ServiceDemand, 0)
+
+	var count int64
+
+	if err := model2.PagesFields(mServiceDemand.ServiceDemand, &out, []string{"id", "title", "kind", "name", "mobile",
+		"status", "created_at"}, page, pageSize, &count, where...); err != nil {
+		return nil, err
+	}
+	list := make([]*DemandInfo, 0)
+
+	for _, v := range out {
+		list = append(list, &DemandInfo{
+			ID:            v.GetEncodeID(),
+			ServiceDemand: v,
+			Kinds:         v.GetKindAttribute(),
+		})
+	}
+	return &controller.ReturnPages{Data: list, Count: count}, nil
+}
+
+// Detail 详细信息
+func (c *Demand) Detail(id uint64) (*DemandInfo, error) {
+	mServiceDemand := model.NewServiceDemand()
+	mServiceDemand.ID = id
+
+	isExist, err := model2.First(mServiceDemand.ServiceDemand)
+
+	if err != nil {
+		return nil, err
+	} else if !isExist {
+		return nil, errors.New("操作错误，需求信息不存在或已删除")
+	} else if mServiceDemand.UID != c.UID {
+		return nil, errors.New("无权限操作")
+	}
+	return &DemandInfo{
+		ID:            mServiceDemand.GetEncodeID(),
+		ServiceDemand: mServiceDemand.ServiceDemand,
+		Kinds:         mServiceDemand.GetKindAttribute(),
+	}, nil
+}
+
+// Form 数据操作
+func (c *Demand) Form(params *DemandParams) error {
+	mServiceDemand := model.NewServiceDemand()
+
+	if params.ID > 0 {
+		mServiceDemand.ID = params.ID
+
+		if isExist, err := model2.FirstField(mServiceDemand.ServiceDemand, []string{"id", "uid", "status", "created_at"}); err != nil {
+			return err
+		} else if !isExist {
+			return errors.New("操作错误，需求信息不存在或已删除")
+		} else if mServiceDemand.UID != c.UID {
+			return errors.New("无权限操作")
+		} else if mServiceDemand.Status != model2.ServiceDemandStatusForDraft {
+			return errors.New("操作错误，当前需求状态不允许修改")
+		}
+	}
+	mServiceDemand.SetKindAttribute(params.Kinds)
+	mServiceDemand.Title = params.Title
+	mServiceDemand.Name = params.Name
+	mServiceDemand.Mobile = params.Mobile
+	mServiceDemand.Description = params.Description
+
+	if mServiceDemand.ID > 0 {
+		mServiceDemand.Status = model2.ServiceDemandStatusForPublish
+
+		return model2.Updates(mServiceDemand.ServiceDemand, mServiceDemand.ServiceDemand)
+	}
+	mServiceDemand.Local.Local = c.local
+	mServiceDemand.UID = c.UID
+
+	if params.IsSubmit > 0 {
+		mServiceDemand.Status = model2.ServiceDemandStatusForPublish
+	}
+	return model2.Create(mServiceDemand.ServiceDemand)
+}
+
+// Delete 删除操作
+func (c *Demand) Delete(id uint64) error {
+	mServiceDemand := model.NewServiceDemand()
+	mServiceDemand.ID = id
+
+	if isExist, err := model2.FirstField(mServiceDemand.ServiceDemand, []string{"id", "uid"}); err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("操作错误，需求信息不存在或已删除")
+	} else if mServiceDemand.UID != c.UID {
+		return errors.New("无权限操作")
+	}
+	return model2.Delete(mServiceDemand.ServiceDemand)
+}
+
+func NewDemand() DemandHandle {
+	return func(session *session.Enterprise, local string) *Demand {
+		return &Demand{
+			Enterprise: session,
+			local:      local,
+		}
+	}
+}

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

@@ -113,13 +113,13 @@ func (c *Demand) Form(params *DemandParams) error {
 	if params.ID > 0 {
 		mTechnologyDemand.ID = params.ID
 
-		isExist, err := model2.FirstField(mTechnologyDemand.TechnologyDemand, []string{"id", "m_uid", "status"})
+		isExist, err := model2.FirstField(mTechnologyDemand.TechnologyDemand, []string{"id", "uid", "status"})
 
 		if err != nil {
 			return err
 		} else if !isExist {
-			return errors.New("操作错误，数据不存在")
+			return errors.New("操作错误，需求信息不存在或已删除")
-		} else if mTechnologyDemand.MUid != c.ManageUID {
+		} else if mTechnologyDemand.UID != c.UID {
 			return errors.New("无权限操作")
 		} else if mTechnologyDemand.Status != model2.TechnologyDemandStatusForRefuse &&
 			mTechnologyDemand.Status != model2.TechnologyDemandStatusForDraft {
@@ -155,8 +155,7 @@ func (c *Demand) Form(params *DemandParams) error {
 		mTechnologyDemand.UpdatedAt = time.Now()
 		return model2.Updates(mTechnologyDemand.TechnologyDemand, mTechnologyDemand.TechnologyDemand)
 	}
-	mTechnologyDemand.TenantID = c.TenantID
+	mTechnologyDemand.UID = c.UID
-	mTechnologyDemand.MUid = c.ManageUID
 	mTechnologyDemand.Local.Local = c.local
 	return model2.Create(mTechnologyDemand.TechnologyDemand)
 }
@@ -172,7 +171,7 @@ func (c *Demand) Delete(id uint64) error {
 		return err
 	} else if !isExist {
 		return errors.New("操作错误，数据不存在")
-	} else if mTechnologyDemand.MUid != c.ManageUID {
+	} else if mTechnologyDemand.UID != c.UID {
 		return errors.New("无权限操作")
 	}
 	if err = model2.Delete(mTechnologyDemand.TechnologyDemand); err != nil {

app/api/enterprise/model/service_demand.go

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

app/common/model/service_demand.go

@@ -0,0 +1,79 @@
+package model
+
+import "encoding/json"
+
+// ServiceDemand 服务需求数据模型
+type ServiceDemand struct {
+	Model
+	Local
+	UID         uint64              `gorm:"column:uid;type:int;default:0;comment:用户uuid" json:"-"`
+	Kind        string              `gorm:"column:kind;type:varchar(50);default:null;comment:需求类型" json:"kind"`
+	Title       string              `gorm:"column:title;type:varchar(50);default:null;comment:需求名称" json:"title"`
+	Name        string              `gorm:"column:name;type:varchar(50);default:null;comment:联系人" json:"name"`
+	Mobile      string              `gorm:"column:mobile;type:varchar(15);default:null;comment:联系人手机号" json:"mobile"`
+	Description string              `gorm:"column:description;type:text;default:null;comment:需求描述" json:"description"`
+	Status      ServiceDemandStatus `gorm:"column:status;type:tinyint(1);default:1;comment:状态" json:"status"`
+	ModelDeleted
+	ModelAt
+}
+
+// ServiceDemandKind 服务需求类型
+type ServiceDemandKind int
+
+const (
+	// ServiceDemandKindForCPTG 成果推广
+	ServiceDemandKindForCPTG ServiceDemandKind = iota + 1
+	// ServiceDemandKindForGJCGJJ 关键成果解决
+	ServiceDemandKindForGJCGJJ
+	// ServiceDemandKindForDJZJYS 对接专家院士
+	ServiceDemandKindForDJZJYS
+	// ServiceDemandKindForSHFD 上市辅导
+	ServiceDemandKindForSHFD
+	// ServiceDemandKindForXMSBFD 项目申报辅导
+	ServiceDemandKindForXMSBFD
+	// ServiceDemandKindForGMZL 购买专利
+	ServiceDemandKindForGMZL
+	// ServiceDemandKindForDJCPLSXYQY 对接产品链上下游企业
+	ServiceDemandKindForDJCPLSXYQY
+	// ServiceDemandKindForDJZFZC 对接政府政策
+	ServiceDemandKindForDJZFZC
+	// ServiceDemandKindForZSCQBJ 知识产权布局
+	ServiceDemandKindForZSCQBJ
+	// ServiceDemandKindForCXYHZ 产学研合作
+	ServiceDemandKindForCXYHZ
+	// ServiceDemandKindForQT 其他
+	ServiceDemandKindForQT
+)
+
+// ServiceDemandStatus 服务需求状态
+type ServiceDemandStatus int
+
+const (
+	// ServiceDemandStatusForDraft 草稿箱
+	ServiceDemandStatusForDraft ServiceDemandStatus = iota
+	// ServiceDemandStatusForPublish 发布
+	ServiceDemandStatusForPublish
+	// ServiceDemandStatusForAcceptance 受理
+	ServiceDemandStatusForAcceptance
+	// ServiceDemandStatusForComplete 完成结束
+	ServiceDemandStatusForComplete
+)
+
+func (m *ServiceDemand) TableName() string {
+	return "service_demand"
+}
+
+func (m *ServiceDemand) GetKindAttribute() []int {
+	out := make([]int, 0)
+	_ = json.Unmarshal([]byte(m.Kind), &out)
+	return out
+}
+
+func (m *ServiceDemand) SetKindAttribute(value []int) {
+	_bytes, _ := json.Marshal(value)
+	m.Kind = string(_bytes)
+}
+
+func NewServiceDemand() *ServiceDemand {
+	return &ServiceDemand{}
+}

app/common/model/technology_demand.go

@@ -8,9 +8,8 @@ import (
 // TechnologyDemand 技术需求数据模型
 type TechnologyDemand struct {
 	Model
-	ModelTenant
 	Local
-	MUid  uint64 `gorm:"column:m_uid;type:int;default:0;comment:用户manage_uuid" json:"-"`
+	UID   uint64 `gorm:"column:uid;type:int;default:0;comment:用户uuid" json:"-"`
 	Title string `gorm:"column:title;type:varchar(50);default:null;comment:需求名称" json:"title"`
 	Kind  string `gorm:"column:kind;type:varchar(50);default:null;comment:需求类别" json:"-"`
 	Area

app/common/model/technology_topic.go

@@ -18,7 +18,7 @@ type TechnologyTopic struct {
 	Keyword   string                `gorm:"column:keyword;type:varchar(255);default:null;comment:关键词" json:"-"`
 	Amount    float64               `gorm:"column:amount;decimal(10,2);default:0;comment:经费" json:"amount"`
 	Source    TechnologyTopicSource `gorm:"column:source;type:tinyint(1);default:0;comment:来源" json:"source"`
-	Kind      TechnologyTopicKind   `gorm:"column:kind;type:tinyint(1);default:0comment:类型" json:"kind"`
+	Kind      TechnologyTopicKind   `gorm:"column:kind;type:tinyint(1);default:0;comment:类型" json:"kind"`
 	BeginAt   time.Time             `gorm:"column:begin_at;type:datetime;not null;comment:开始时间" json:"begin_at"`
 	FinishAt  time.Time             `gorm:"column:finish_at;type:datetime;not null;comment:结束时间" json:"finish_at"`
 	Status    TechnologyTopicStatus `gorm:"column:status;type:tinyint(1);default:0;comment:状态" json:"status"`

router/address.go

@@ -191,6 +191,16 @@ func registerEnterpriseAPI(app *gin.Engine) {
 		technologyV1.POST("/project/shelf", _api.ProjectShelf)
 		technologyV1.POST("/project/delete", _api.ProjectDelete)
 	}
+	// Service 服务信息
+	serviceV1 := v1.Group("/service")
+	{
+		_api := new(api2.Service)
+		serviceV1.POST("/demand", _api.Demand)
+		serviceV1.POST("/demand/detail", _api.DemandDetail)
+		serviceV1.POST("/demand/add", _api.DemandAdd)
+		serviceV1.POST("/demand/edit", _api.DemandEdit)
+		serviceV1.POST("/demand/delete", _api.DemandDelete)
+	}
 	// Identity 身份信息
 	identityV1 := v1.Group("/config")
 	{