作者 郑周

Merge branch 'dev-zhengzhou' into test

... ... @@ -13,17 +13,17 @@ import (
"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/infrastructure/dao"
)
type SummaryEvaluationServeice struct {
type SummaryEvaluationService struct {
}
func NewSummaryEvaluationServeice() *SummaryEvaluationServeice {
newService := &SummaryEvaluationServeice{}
func NewSummaryEvaluationService() *SummaryEvaluationService {
newService := &SummaryEvaluationService{}
return newService
}
// GetExecutorCycleList
// 获取评估执行人可用的周期列表
func (srv *SummaryEvaluationServeice) GetExecutorCycleList(param *command.QueryCycleList) (map[string]interface{}, error) {
func (srv *SummaryEvaluationService) GetExecutorCycleList(param *command.QueryCycleList) (map[string]interface{}, error) {
transactionContext, err := factory.CreateTransactionContext(nil)
if err != nil {
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
... ... @@ -71,7 +71,7 @@ func (srv *SummaryEvaluationServeice) GetExecutorCycleList(param *command.QueryC
// GetMenu
// 根据周期获取菜单显示
func (srv *SummaryEvaluationServeice) GetMenu(param *command.QueryMenu) (map[string]interface{}, error) {
func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[string]interface{}, error) {
transactionContext, err := factory.CreateTransactionContext(nil)
if err != nil {
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
... ... @@ -241,7 +241,7 @@ func (srv *SummaryEvaluationServeice) GetMenu(param *command.QueryMenu) (map[str
}
// buildSummaryItemValue 将填写值填充进评估项
func (srv *SummaryEvaluationServeice) buildSummaryItemValue(itemList []*domain.EvaluationItemUsed, valueList []*domain.SummaryEvaluationValue) (
func (srv *SummaryEvaluationService) buildSummaryItemValue(itemList []*domain.EvaluationItemUsed, valueList []*domain.SummaryEvaluationValue) (
itemValues []adapter.EvaluationItemAdapter) {
itemValues = []adapter.EvaluationItemAdapter{}
valueMap := map[int]*domain.SummaryEvaluationValue{}
... ... @@ -278,7 +278,7 @@ func (srv *SummaryEvaluationServeice) buildSummaryItemValue(itemList []*domain.E
}
// 获取综合自评详情
func (srv *SummaryEvaluationServeice) GetEvaluationSelf(param *command.QueryEvaluationInfo) (*adapter.EvaluationInfoAdapter, error) {
func (srv *SummaryEvaluationService) GetEvaluationSelf(param *command.QueryEvaluationInfo) (*adapter.EvaluationInfoAdapter, error) {
transactionContext, err := factory.CreateTransactionContext(nil)
if err != nil {
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
... ... @@ -350,7 +350,7 @@ func (srv *SummaryEvaluationServeice) GetEvaluationSelf(param *command.QueryEval
}
// 编辑综合自评详情
func (srv *SummaryEvaluationServeice) EditEvaluationSelf(param *command.EditEvaluationValue) (map[string][]adapter.EvaluationItemAdapter, error) {
func (srv *SummaryEvaluationService) EditEvaluationSelf(param *command.EditEvaluationValue) (map[string][]adapter.EvaluationItemAdapter, error) {
transactionContext, err := factory.CreateTransactionContext(nil)
if err != nil {
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
... ... @@ -459,7 +459,7 @@ func (srv *SummaryEvaluationServeice) EditEvaluationSelf(param *command.EditEval
// GetTargetUserCycleList
// 获取周期列表,被评估的周期列表
func (srv *SummaryEvaluationServeice) GetTargetUserCycleList(param *command.QueryCycleList) (map[string]interface{}, error) {
func (srv *SummaryEvaluationService) GetTargetUserCycleList(param *command.QueryCycleList) (map[string]interface{}, error) {
transactionContext, err := factory.CreateTransactionContext(nil)
if err != nil {
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
... ...
... ... @@ -13,7 +13,7 @@ type SummaryEvaluationController struct {
}
func (c *SummaryEvaluationController) GetExecutorCycleList() {
srv := service.NewSummaryEvaluationServeice()
srv := service.NewSummaryEvaluationService()
paramReq := &command.QueryCycleList{}
err := c.BindJSON(paramReq)
if err != nil {
... ... @@ -28,7 +28,7 @@ func (c *SummaryEvaluationController) GetExecutorCycleList() {
}
func (c *SummaryEvaluationController) GetMenu() {
srv := service.NewSummaryEvaluationServeice()
srv := service.NewSummaryEvaluationService()
paramReq := &command.QueryMenu{}
err := c.BindJSON(paramReq)
if err != nil {
... ... @@ -45,7 +45,7 @@ func (c *SummaryEvaluationController) GetMenu() {
}
func (c *SummaryEvaluationController) GetEvaluationSelf() {
srv := service.NewSummaryEvaluationServeice()
srv := service.NewSummaryEvaluationService()
paramReq := &command.QueryEvaluationInfo{}
err := c.BindJSON(paramReq)
if err != nil {
... ... @@ -62,7 +62,7 @@ func (c *SummaryEvaluationController) GetEvaluationSelf() {
}
func (c *SummaryEvaluationController) EditEvaluationSelf() {
srv := service.NewSummaryEvaluationServeice()
srv := service.NewSummaryEvaluationService()
paramReq := &command.EditEvaluationValue{}
err := c.BindJSON(paramReq)
if err != nil {
... ... @@ -79,7 +79,7 @@ func (c *SummaryEvaluationController) EditEvaluationSelf() {
}
func (c *SummaryEvaluationController) GetTargetUserCycleList() {
srv := service.NewSummaryEvaluationServeice()
srv := service.NewSummaryEvaluationService()
paramReq := &command.QueryCycleList{}
err := c.BindJSON(paramReq)
if err != nil {
... ...