熊哥提交

app/api/admin/controller/manage/research.go

@@ -5,9 +5,11 @@ import (
 	"SciencesServer/app/basic/config"
 	"SciencesServer/app/basic/controller"
 	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/service"
 	"SciencesServer/app/session"
 	config2 "SciencesServer/config"
 	"errors"
+	"strings"
 )
 
 // Research 研究机构
@@ -165,8 +167,26 @@ func (c *Research) Form(params *BasicParams, other *config.IdentityForResearch)
 	if c.TenantID <= 0 {
 		mManageResearch.TenantID = params.TenantID
 	}
+	_industrys := make([]string, 0)
+
+	for _, v := range params.Industrys {
+		_industrys = append(_industrys, config.GetIndustryInfo(v, "-", "-").Value)
+	}
+	manage := service.NewESManage(
+		service.WithManageIdentity(config.TenantUserIdentityForResearch),
+		service.WithManageIndustry(strings.Join(_industrys, "；")),
+		service.WithManageKeyword(strings.Join(params.Keywords, "；")),
+		service.WithManageResearch(strings.Join(other.Researchs, "；")),
+	)
+
 	if mManageResearch.ID > 0 {
-		return model2.Updates(mManageResearch.ManageResearch, mManageResearch.ManageResearch)
+		if err := model2.Updates(mManageResearch.ManageResearch, mManageResearch.ManageResearch); err != nil {
+			return err
+		}
+		if mManageResearch.ExamineStatus == model2.ExamineStatusForAgree {
+			_ = manage.Update()
+		}
+		return nil
 	}
 	mManageResearch.Name = params.Name
 	mManageResearch.Code = params.Code
@@ -179,7 +199,13 @@ func (c *Research) Form(params *BasicParams, other *config.IdentityForResearch)
 	} else if isExist {
 		return errors.New("操作错误，已存在同一研究机构代码")
 	}
-	return model2.Create(mManageResearch.ManageResearch)
+	if err := model2.Create(mManageResearch.ManageResearch); err != nil {
+		return err
+	}
+	service.WithManageID(mManageResearch.ID)(manage)
+	service.WithManageTitle(params.Name)(manage)
+	return manage.Create()
+
 }
 
 // Detail 详细信息