feat:优化项目信息

This commit is contained in:
henry
2022-02-08 11:05:47 +08:00
parent 252182f089
commit 46476267aa
13 changed files with 125 additions and 37 deletions

View File

@ -2,10 +2,13 @@ package technology
import (
"SciencesServer/app/api/admin/model"
"SciencesServer/app/basic/config"
"SciencesServer/app/basic/controller"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/service"
"SciencesServer/app/session"
"errors"
"strings"
)
type Achievement struct {
@ -87,7 +90,8 @@ func (c *Achievement) Examine(id uint64, status int, remark string) error {
mTechnologyAchievement := model.NewTechnologyAchievement()
mTechnologyAchievement.ID = id
isExist, err := model2.FirstField(mTechnologyAchievement.TechnologyAchievement, []string{"id", "tenant_id", "status"})
isExist, err := model2.FirstField(mTechnologyAchievement.TechnologyAchievement, []string{"id", "tenant_id", "title",
"industry", "keyword", "status"})
if err != nil {
return err
@ -100,7 +104,28 @@ func (c *Achievement) Examine(id uint64, status int, remark string) error {
if mTechnologyAchievement.Status != model2.TechnologyStatusKindForExamining {
return errors.New("操作错误,当前成果状态不允许审核")
}
return handleExamine(mTechnologyAchievement.TechnologyAchievement, c.UID, model2.SysUserExamineLogKindForAchievement, status, remark)
if err = handleExamine(mTechnologyAchievement.TechnologyAchievement, c.UID, model2.SysUserExamineLogKindForAchievement, status, remark, func() error {
if model2.ExamineStatusKind(status) == model2.ExamineStatusForAgree {
_industrys := make([]string, 0)
for _, v := range mTechnologyAchievement.GetIndustryAttribute() {
_industrys = append(_industrys, config.GetIndustryInfo(v, "-", "-").Value)
}
// 存放ES中
manage := service.NewESAchievement(
service.WithAchievementID(mTechnologyAchievement.ID),
service.WithAchievementTitle(mTechnologyAchievement.Title),
service.WithAchievementIndustry(strings.Join(_industrys, "")),
service.WithAchievementKeyword(strings.Join(mTechnologyAchievement.GetKeywordAttribute(), "")),
)
return manage.Create()
}
return nil
}); err != nil {
return err
}
return nil
}
// Shelf 上下架