feat:完善项目信息

This commit is contained in:
henry
2022-01-13 18:07:40 +08:00
parent 27cb063a6c
commit 7492c67378
25 changed files with 96 additions and 130 deletions

View File

@ -120,7 +120,7 @@ func (*Manage) Equipment(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := manage.NewEquipment()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
data, err := manage.NewEquipment()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(uint64)).
List(form.Kind, form.Code, form.Title, form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -132,7 +132,7 @@ func (*Manage) EquipmentAdd(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
err := manage.NewEquipment()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
err := manage.NewEquipment()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(uint64)).
Form(&manage.EquipmentParams{Kind: form.Kind, Code: form.Code, Title: form.Title, Params: form.Params, Description: form.Description})
api.APIResponse(err)(c)
}
@ -146,7 +146,7 @@ func (*Manage) EquipmentEdit(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
err := manage.NewEquipment()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
err := manage.NewEquipment()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(uint64)).
Form(&manage.EquipmentParams{ID: form.Convert(), Kind: form.Kind, Code: form.Code, Title: form.Title,
Params: form.Params, Description: form.Description})
@ -160,7 +160,7 @@ func (*Manage) EquipmentDelete(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
err := manage.NewEquipment()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
err := manage.NewEquipment()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(uint64)).
Delete(form.Convert())
api.APIResponse(err)(c)
}
@ -172,8 +172,7 @@ func (*Manage) CompanyDetail(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := manage.NewCompany()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
Detail(form.Convert())
data, err := manage.NewCompany()(api.GetSession()(c).(*session.Enterprise)).Detail(form.Convert())
api.APIResponse(err, data)(c)
}
@ -186,7 +185,7 @@ func (*Manage) CompanyProduct(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := manage.NewCompany()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
data, err := manage.NewCompany()(api.GetSession()(c).(*session.Enterprise)).
Product(form.Convert(), form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -203,7 +202,7 @@ func (*Manage) Expert(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise)).
Instance(form.Name, form.Mobile, form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -217,7 +216,7 @@ func (*Manage) ExpertAchievement(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise)).
Achievement(form.Convert(), form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -231,7 +230,7 @@ func (*Manage) ExpertProject(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise)).
Project(form.Convert(), form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -245,7 +244,7 @@ func (*Manage) ExpertPatent(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise)).
Patent(form.Convert(), form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -259,7 +258,7 @@ func (*Manage) ExpertPaper(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise)).
Paper(form.Convert(), form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -273,7 +272,7 @@ func (*Manage) ExpertCooperate(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
data, err := manage.NewExpert()(api.GetSession()(c).(*session.Enterprise)).
Cooperate(form.Convert(), form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -287,7 +286,7 @@ func (*Manage) ResearchLaboratory(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := manage.NewResearch()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
data, err := manage.NewResearch()(api.GetSession()(c).(*session.Enterprise)).
Laboratory(form.Name, form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -301,7 +300,7 @@ func (*Manage) ResearchVisit(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := manage.NewResearch()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
data, err := manage.NewResearch()(api.GetSession()(c).(*session.Enterprise)).
Visit(form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -315,7 +314,7 @@ func (*Manage) LaboratoryAchievement(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise)).
Achievement(form.Convert(), form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -329,7 +328,7 @@ func (*Manage) LaboratoryProject(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise)).
Project(form.Convert(), form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -343,7 +342,7 @@ func (*Manage) LaboratoryPatent(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise)).
Patent(form.Convert(), form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -357,7 +356,7 @@ func (*Manage) LaboratoryPaper(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise)).
Paper(form.Convert(), form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -371,7 +370,7 @@ func (*Manage) LaboratoryCooperate(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise)).
Cooperate(form.Convert(), form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -383,7 +382,7 @@ func (*Manage) LaboratoryCooperateDetail(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
data, err := manage.NewLaboratory()(api.GetSession()(c).(*session.Enterprise)).
CooperateDetail(form.Convert())
api.APIResponse(err, data)(c)
}
@ -397,7 +396,7 @@ func (*Manage) AgentCompany(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := manage.NewAgent()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
data, err := manage.NewAgent()(api.GetSession()(c).(*session.Enterprise)).
Company(form.Name, form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -411,7 +410,7 @@ func (*Manage) AgentCompanyAdd(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
err := manage.NewAgent()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
err := manage.NewAgent()(api.GetSession()(c).(*session.Enterprise)).
Form(0, form.Name, form.Industrys)
api.APIResponse(err)(c)
}
@ -426,7 +425,7 @@ func (*Manage) AgentCompanyEdit(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
err := manage.NewAgent()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
err := manage.NewAgent()(api.GetSession()(c).(*session.Enterprise)).
Form(form.Convert(), form.Name, form.Industrys)
api.APIResponse(err)(c)
}

View File

@ -49,7 +49,7 @@ func (*Settled) Company(c *gin.Context) {
}
form.License = (&api.ImageForm{Image: form.License}).FilterImageURL()
err := settled.NewCompany()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
err := settled.NewCompany()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(uint64)).
Launch(form.settledForm.bind(), (&api.IDStringForm{ID: form.InviterCode}).Convert(), &form.IdentityForCompany)
api.APIResponse(err)(c)
}
@ -63,7 +63,7 @@ func (*Settled) CompanyGet(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := settled.NewCompany()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).Get(form.Code)
data, err := settled.NewCompany()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(uint64)).Get(form.Code)
api.APIResponse(err, data)(c)
}
@ -77,7 +77,7 @@ func (*Settled) Expert(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
err := settled.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
err := settled.NewExpert()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(uint64)).
Launch(form.settledForm.bind(), &form.IdentityForExpert)
api.APIResponse(err)(c)
}
@ -92,7 +92,7 @@ func (*Settled) Research(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
err := settled.NewResearch()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
err := settled.NewResearch()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(uint64)).
Launch(form.settledForm.bind(), &form.IdentityForResearch)
api.APIResponse(err)(c)
}
@ -107,7 +107,7 @@ func (*Settled) Laboratory(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
err := settled.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
err := settled.NewLaboratory()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(uint64)).
Launch(form.settledForm.bind(), &form.IdentityForLaboratory)
api.APIResponse(err)(c)
}
@ -133,7 +133,7 @@ func (*Settled) Agent(c *gin.Context) {
form.IDImage.Behind = (&api.ImageForm{Image: form.IDImage.Behind}).FilterImageURL()
form.IDImage.Hold = (&api.ImageForm{Image: form.IDImage.Hold}).FilterImageURL()
err := settled.NewAgent()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(string)).
err := settled.NewAgent()(api.GetSession()(c).(*session.Enterprise), api.GetTenantID()(c).(uint64)).
Launch(form.settledForm.bind(), &form.IdentityForAgent)
api.APIResponse(err)(c)
}