feat：完善信息

app/api/admin/api/bill.go

@@ -0,0 +1 @@
+package api

app/api/admin/api/technology.go

@@ -321,3 +321,29 @@ func (*Technology) DemandDelete(c *gin.Context) {
 	err := technology.NewDemand()(api.GetSession()(c).(*session.Admin)).Delete(form.Convert())
 	api.APIResponse(err)(c)
 }
+
+func (*Technology) Project(c *gin.Context) {
+	form := &struct {
+		api.TenantIDStringForm
+		Title string `json:"title" form:"title"`
+		api.PageForm
+	}{}
+	if err := api.Bind(form)(c); err != nil {
+		api.APIFailure(err.(error))(c)
+		return
+	}
+	data, err := technology.NewProject()(api.GetSession()(c).(*session.Admin)).Instance(form.Convert(), form.Title,
+		form.Page, form.PageSize)
+	api.APIResponse(err, data)(c)
+}
+
+func (*Technology) ProjectDelete(c *gin.Context) {
+	form := new(api.IDStringForm)
+
+	if err := api.Bind(form)(c); err != nil {
+		api.APIFailure(err.(error))(c)
+		return
+	}
+	err := technology.NewProject()(api.GetSession()(c).(*session.Admin)).Delete(form.Convert())
+	api.APIResponse(err)(c)
+}

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

@@ -0,0 +1,19 @@
+package bill
+
+import "SciencesServer/app/session"
+
+type Instance struct {
+	*session.Admin
+}
+
+type InstanceHandle func(session *session.Admin) *Instance
+
+func (c *Instance) Index() {
+
+}
+
+func NewInstance() InstanceHandle {
+	return func(session *session.Admin) *Instance {
+		return &Instance{session}
+	}
+}

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

@@ -0,0 +1,82 @@
+package technology
+
+import (
+	"SciencesServer/app/api/admin/model"
+	"SciencesServer/app/basic/controller"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/session"
+	"errors"
+)
+
+type Project struct {
+	*session.Admin
+}
+
+type ProjectHandle func(session *session.Admin) *Project
+
+type (
+	// ProjectInstance 项目信息
+	ProjectInstance struct {
+		ID       string `json:"id"`
+		TenantID string `json:"tenant_id"`
+		*model2.TechnologyProject
+		Area string `json:"area"`
+	}
+)
+
+// Instance 首页信息
+func (c *Project) Instance(tenantID uint64, title string, page, pageSize int) (*controller.ReturnPages, error) {
+	mTechnologyProject := model.NewTechnologyProject()
+
+	where := make([]*model2.ModelWhere, 0)
+
+	if c.TenantID > 0 {
+		where = append(where, model2.NewWhere("p.tenant_id", c.TenantID))
+	}
+	if tenantID > 0 {
+		where = append(where, model2.NewWhere("p.tenant_id", tenantID))
+	}
+	if title != "" {
+		where = append(where, model2.NewWhereLike("p.name", title))
+	}
+	var count int64
+
+	out, err := mTechnologyProject.Projects(page, pageSize, &count, where...)
+
+	if err != nil {
+		return nil, err
+	}
+	list := make([]*ProjectInstance, 0)
+
+	for _, v := range out {
+		list = append(list, &ProjectInstance{
+			ID: v.GetEncodeID(), TenantID: v.GetEncodeTenantID(),
+			TechnologyProject: v.TechnologyProject, Area: v.FormatBasic(),
+		})
+	}
+	return &controller.ReturnPages{Data: list, Count: count}, nil
+}
+
+// Delete 删除操作
+func (c *Project) Delete(id uint64) error {
+	mTechnologyProject := model.NewTechnologyProject()
+	mTechnologyProject.ID = id
+
+	isExist, err := model2.FirstField(mTechnologyProject.TechnologyProject, []string{"id", "tenant_id"})
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("操作错误，产品信息不存在或已被删除")
+	}
+	if c.TenantID > 0 && c.TenantID != mTechnologyProject.TenantID {
+		return errors.New("操作错误，无权限操作")
+	}
+	return model2.Delete(mTechnologyProject.TechnologyProject)
+}
+
+func NewProject() ProjectHandle {
+	return func(session *session.Admin) *Project {
+		return &Project{session}
+	}
+}

app/api/admin/model/technology_project.go

@@ -0,0 +1,42 @@
+package model
+
+import (
+	"SciencesServer/app/common/model"
+	"SciencesServer/serve/orm"
+	"fmt"
+)
+
+type TechnologyProject struct {
+	*model.TechnologyProject
+}
+
+type TechnologyProjectInfo struct {
+	*model.TechnologyProject
+	model.Area
+}
+
+// Projects 项目信息
+func (m *TechnologyProject) Projects(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*TechnologyProjectInfo, error) {
+	db := orm.GetDB().Table(m.TableName()+" AS p").
+		Select("p.*", "t.province", "t.city").
+		Joins(fmt.Sprintf("LEFT JOIN %s AS t ON p.tenant_id = t.id", model.NewSysTenant().TableName()))
+
+	if len(where) > 0 {
+		for _, wo := range where {
+			db = db.Where(wo.Condition, wo.Value)
+		}
+	}
+	out := make([]*TechnologyProjectInfo, 0)
+
+	if err := db.Count(count).Error; err != nil {
+		return nil, err
+	}
+	if err := db.Order("p.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func NewTechnologyProject() *TechnologyProject {
+	return &TechnologyProject{model.NewTechnologyProject()}
+}

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

@@ -25,9 +25,10 @@ type (
 	}
 	// DemandServiceDetail 需求服务详细信息
 	DemandServiceDetail struct {
-		ID        string                   `json:"id"`
-		CreatedAt time.Time                `json:"created_at"`
-		Progress  []*DemandServiceProgress `json:"progress"`
+		ID        string                               `json:"id"`
+		Status    model2.TechnologyDemandServiceStatus `json:"status"`
+		CreatedAt time.Time                            `json:"created_at"`
+		Progress  []*DemandServiceProgress             `json:"progress"`
 	}
 	// DemandServiceProgress 需求服务进度信息
 	DemandServiceProgress struct {
@@ -100,6 +101,7 @@ func (c *DemandService) Detail(id uint64) (*DemandServiceDetail, error) {
 	}
 	return &DemandServiceDetail{
 		ID:        mTechnologyDemandService.GetEncodeID(),
+		Status:    mTechnologyDemandService.Status,
 		CreatedAt: mTechnologyDemandService.CreatedAt,
 		Progress:  progress,
 	}, nil