Merge remote-tracking branch 'origin/test' into test

@@ -160,3 +160,11 @@ func CreateStaffAssessTaskRepository(options map[string]interface{}) domain.Staf
 	}
 	}
 	return repository.NewStaffAssessTaskRepository(transactionContext)
 	return repository.NewStaffAssessTaskRepository(transactionContext)
 }
 }
+
+func CreateStaffAssessContentTempRepository(options map[string]interface{}) domain.StaffAssessContentTempRepository {
+	var transactionContext *pg.TransactionContext
+	if value, ok := options["transactionContext"]; ok {
+		transactionContext = value.(*pg.TransactionContext)
+	}
+	return repository.NewStaffAssessContentTempRepository(transactionContext)
+}

@@ -479,7 +479,8 @@ func (srv StaffAssessServeice) createStaffAssess(transactionContext application.
 	})
 	})
 	//获取员工信息
 	//获取员工信息
 	_, userList, err := userRepo.Find(map[string]interface{}{
 	_, userList, err := userRepo.Find(map[string]interface{}{
-		"ids": selfUserId,
+		"ids":    selfUserId,
+		"status": 1,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.ARG_ERROR, "获取员工信息"+err.Error())
 		return nil, application.ThrowError(application.ARG_ERROR, "获取员工信息"+err.Error())
@@ -780,7 +781,8 @@ func (srv StaffAssessServeice) SaveAssessInviteUser(param *command.SaveAssessInv
 	var inviteSameSuper []domain.StaffDesc
 	var inviteSameSuper []domain.StaffDesc
 	if len(inviteSameSuperId) > 0 {
 	if len(inviteSameSuperId) > 0 {
 		_, userList, err := userRepo.Find(map[string]interface{}{
 		_, userList, err := userRepo.Find(map[string]interface{}{
-			"ids": inviteSameSuperId,
+			"ids":    inviteSameSuperId,
+			"status": 1,
 		})
 		})
 		if err != nil {
 		if err != nil {
 			return nil, application.ThrowError(application.ARG_ERROR, "获取用户信息"+err.Error())
 			return nil, application.ThrowError(application.ARG_ERROR, "获取用户信息"+err.Error())
@@ -797,7 +799,8 @@ func (srv StaffAssessServeice) SaveAssessInviteUser(param *command.SaveAssessInv
 	var inviteDiffSuper []domain.StaffDesc
 	var inviteDiffSuper []domain.StaffDesc
 	if len(InviteDiffSuperId) > 0 {
 	if len(InviteDiffSuperId) > 0 {
 		_, userList, err := userRepo.Find(map[string]interface{}{
 		_, userList, err := userRepo.Find(map[string]interface{}{
-			"ids": InviteDiffSuperId,
+			"ids":    InviteDiffSuperId,
+			"status": 1,
 		})
 		})
 		if err != nil {
 		if err != nil {
 			return nil, application.ThrowError(application.ARG_ERROR, "获取用户信息"+err.Error())
 			return nil, application.ThrowError(application.ARG_ERROR, "获取用户信息"+err.Error())
@@ -1136,6 +1139,7 @@ func (srv StaffAssessServeice) SelectAssessInviteUser(param *query.SelectAssessI
 		"companyId": param.CompanyId,
 		"companyId": param.CompanyId,
 		"name":      param.InviteUserName,
 		"name":      param.InviteUserName,
 		"limit":     20,
 		"limit":     20,
+		"status":    1,
 	}
 	}
 	if param.PageSize > 0 {
 	if param.PageSize > 0 {
 		condition["limit"] = param.PageSize
 		condition["limit"] = param.PageSize
@@ -1862,7 +1866,8 @@ loop:
 	var chargeUserList []*domain.User
 	var chargeUserList []*domain.User
 	if len(chargeUserIds) > 0 {
 	if len(chargeUserIds) > 0 {
 		_, chargeUserList, err = userRepo.Find(map[string]interface{}{
 		_, chargeUserList, err = userRepo.Find(map[string]interface{}{
-			"ids": chargeUserIds,
+			"ids":    chargeUserIds,
+			"status": 1, //正常的用户
 		})
 		})
 		if err != nil {
 		if err != nil {
 			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取主管员工数据"+err.Error())
 			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取主管员工数据"+err.Error())

 package service
 package service
 
 
 import (
 import (
+	"time"
+
 	"github.com/linmadan/egglib-go/core/application"
 	"github.com/linmadan/egglib-go/core/application"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/factory"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/factory"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/staff_assess/adapter"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/staff_assess/adapter"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/staff_assess/command"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/staff_assess/command"
+	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
 )
 )
 
 
 //调试用，手动调用CreateStaffAssessTask
 //调试用，手动调用CreateStaffAssessTask
@@ -31,14 +34,77 @@ func (srv StaffAssessServeice) InvokCreateStaffAssessTask(param *command.CreateS
 }
 }
 
 
 //保存员工绩效评估填写过程中即写即存的内容
 //保存员工绩效评估填写过程中即写即存的内容
-func (srv StaffAssessServeice) SaveAssessContentTemp(param *command.SaveAssessInfoCommand) error {
+func (srv StaffAssessServeice) SaveAssessContentTemp(param *command.SaveAssessInfoCommand) (map[string]interface{}, error) {
 
 
-	return nil
+	transactionContext, err := factory.CreateTransactionContext(nil)
+	if err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	if err := transactionContext.StartTransaction(); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	defer func() {
+		_ = transactionContext.RollbackTransaction()
+	}()
+	//获取旧的临时数据内容
+	contentTempRepo := factory.CreateStaffAssessContentTempRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	})
+	//获取评估填写的内容
+	// assessContentRepo := factory.CreateStaffAssessContentRepository(map[string]interface{}{
+	// 	"transactionContext": transactionContext,
+	// })
+	assessRepo := factory.CreateStaffAssessRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	})
+	assessData, err := assessRepo.FindOne(map[string]interface{}{
+		"id": param.AssessId,
+	})
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取评估任务"+err.Error())
+	}
+
+	// staffAssessId
+	_, contentTempList, err := contentTempRepo.Find(map[string]interface{}{
+		"staffAssessId": param.AssessId,
+	})
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取临时保存的内容"+err.Error())
+	}
+	nowTime := time.Now()
+	if len(contentTempList) == 0 {
+		//获取评估模板
+		assessContentList, err := srv.getAssessSelfInfoUncompleted(transactionContext, assessData)
+		if err != nil {
+			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取评估模板，"+err.Error())
+		}
+		//转填入临时的数据
+		for _, v := range assessContentList {
+			item := &domain.StaffAssessContentTemp{
+				Id:            0,
+				StaffAssessId: v.StaffAssessId,
+				SortBy:        v.SortBy,
+				Category:      v.Category,
+				Name:          v.Name,
+				Remark:        v.Remark,
+				Value:         "",
+				CreatedAt:     nowTime,
+				UpdatedAt:     nowTime,
+			}
+			contentTempList = append(contentTempList, item)
+		}
+	}
+	//更新assessContentTemp
+	if err := transactionContext.CommitTransaction(); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	return nil, nil
 }
 }
 
 
 //获取员工绩效评估填写内容
 //获取员工绩效评估填写内容
 //临时数据存在时就获取临时数据
 //临时数据存在时就获取临时数据
 //不存在就获取实际保存的数据
 //不存在就获取实际保存的数据
 func (srv StaffAssessServeice) GetAssessContentTemp(param *command.SaveAssessInfoCommand) (*adapter.AssessInfoResp, error) {
 func (srv StaffAssessServeice) GetAssessContentTemp(param *command.SaveAssessInfoCommand) (*adapter.AssessInfoResp, error) {
+	//将临时保存的数据填入模板中
 	return nil, nil
 	return nil, nil
 }
 }

@@ -13,7 +13,6 @@ type StaffAssessContentTemp struct {
 	Value         string                `json:"value"`         //评估填写的值
 	Value         string                `json:"value"`         //评估填写的值
 	CreatedAt     time.Time             `json:"createdAt"`     //数据创建时间
 	CreatedAt     time.Time             `json:"createdAt"`     //数据创建时间
 	UpdatedAt     time.Time             `json:"updatedAt"`     //数据更新时间
 	UpdatedAt     time.Time             `json:"updatedAt"`     //数据更新时间
-	DeletedAt     *time.Time            `json:"deletedAt"`
 }
 }
 
 
 type StaffAssessContentTempRepository interface {
 type StaffAssessContentTempRepository interface {

@@ -8,20 +8,14 @@ import (
 
 
 // 填写的评估内容
 // 填写的评估内容
 type StaffAssessContentTemp struct {
 type StaffAssessContentTemp struct {
-	tableName     struct{} `pg:"staff_assess_content_temp" comment:"填写的评估项"`
-	Id            int      `pg:",pk"` //id
-	StaffAssessId int      //用户需要的评估项id
-	SortBy        int      //排序
-	Category      string   //类别
-	Name          string   //名称
-	PromptTitle   string   //问题标题
-	PromptText    string   //提示项正文
-	Value         string   //评估填写的值
-	ReteResult    string   //评估的结果
-	Rule          domain.EvaluationRule
-	Remark        []domain.AssessContemtRemark
-	Weight        int       //权重
-	CreatedAt     time.Time //数据创建时间
-	UpdatedAt     time.Time //数据更新时间
-	DeletedAt     *time.Time
+	tableName     struct{}                     `pg:"staff_assess_content_temp" comment:"临时填写的评估项"`
+	Id            int                          `pg:",pk"`             //id
+	StaffAssessId int                          `json:"staffAssessId"` //用户需要的评估项id
+	SortBy        int                          `json:"sortBy"`        //排序
+	Category      string                       `json:"category"`      //类别
+	Name          string                       `json:"name"`          //名称
+	Remark        []domain.AssessContemtRemark `json:"remark"`        //填写的反馈
+	Value         string                       `json:"value"`         //评估填写的值
+	CreatedAt     time.Time                    `json:"createdAt"`     //数据创建时间
+	UpdatedAt     time.Time                    `json:"updatedAt"`     //数据更新时间
 }
 }

@@ -3,7 +3,6 @@ package repository
 import (
 import (
 	"errors"
 	"errors"
 	"fmt"
 	"fmt"
-	"time"
 
 
 	"github.com/go-pg/pg/v10"
 	"github.com/go-pg/pg/v10"
 	pgTransaction "github.com/linmadan/egglib-go/transaction/pg"
 	pgTransaction "github.com/linmadan/egglib-go/transaction/pg"
@@ -15,49 +14,37 @@ type StaffAssessContentTempRepository struct {
 	transactionContext *pgTransaction.TransactionContext
 	transactionContext *pgTransaction.TransactionContext
 }
 }
 
 
-// var _ domain.StaffAssessContentRepository = (*StaffAssessContentTempRepository)(nil)
+var _ domain.StaffAssessContentTempRepository = (*StaffAssessContentTempRepository)(nil)
 
 
 func NewStaffAssessContentTempRepository(transactionContext *pgTransaction.TransactionContext) *StaffAssessContentTempRepository {
 func NewStaffAssessContentTempRepository(transactionContext *pgTransaction.TransactionContext) *StaffAssessContentTempRepository {
 	return &StaffAssessContentTempRepository{transactionContext: transactionContext}
 	return &StaffAssessContentTempRepository{transactionContext: transactionContext}
 }
 }
 
 
-func (repo *StaffAssessContentTempRepository) TransformToDomain(d *models.StaffAssessContent) *domain.StaffAssessContent {
-	return &domain.StaffAssessContent{
+func (repo *StaffAssessContentTempRepository) TransformToDomain(d *models.StaffAssessContentTemp) *domain.StaffAssessContentTemp {
+	return &domain.StaffAssessContentTemp{
 		Id:            d.Id,
 		Id:            d.Id,
 		StaffAssessId: d.StaffAssessId,
 		StaffAssessId: d.StaffAssessId,
 		SortBy:        d.SortBy,
 		SortBy:        d.SortBy,
 		Category:      d.Category,
 		Category:      d.Category,
 		Name:          d.Name,
 		Name:          d.Name,
-		PromptTitle:   d.PromptTitle,
-		PromptText:    d.PromptText,
 		Remark:        d.Remark,
 		Remark:        d.Remark,
 		Value:         d.Value,
 		Value:         d.Value,
-		ReteResult:    d.ReteResult,
-		Rule:          d.Rule,
-		Weight:        d.Weight,
 		CreatedAt:     d.CreatedAt,
 		CreatedAt:     d.CreatedAt,
 		UpdatedAt:     d.UpdatedAt,
 		UpdatedAt:     d.UpdatedAt,
-		DeletedAt:     nil,
 	}
 	}
 }
 }
 
 
-func (repo *StaffAssessContentTempRepository) Save(d *domain.StaffAssessContent) (*domain.StaffAssessContent, error) {
-	saveModel := models.StaffAssessContent{
+func (repo *StaffAssessContentTempRepository) Save(d *domain.StaffAssessContentTemp) (*domain.StaffAssessContentTemp, error) {
+	saveModel := models.StaffAssessContentTemp{
 		Id:            d.Id,
 		Id:            d.Id,
 		StaffAssessId: d.StaffAssessId,
 		StaffAssessId: d.StaffAssessId,
 		SortBy:        d.SortBy,
 		SortBy:        d.SortBy,
 		Category:      d.Category,
 		Category:      d.Category,
 		Name:          d.Name,
 		Name:          d.Name,
-		PromptTitle:   d.PromptTitle,
-		PromptText:    d.PromptText,
 		Remark:        d.Remark,
 		Remark:        d.Remark,
 		Value:         d.Value,
 		Value:         d.Value,
-		ReteResult:    d.ReteResult,
-		Rule:          d.Rule,
 		CreatedAt:     d.CreatedAt,
 		CreatedAt:     d.CreatedAt,
 		UpdatedAt:     d.UpdatedAt,
 		UpdatedAt:     d.UpdatedAt,
-		Weight:        d.Weight,
-		DeletedAt:     nil,
 	}
 	}
 	tx := repo.transactionContext.PgTx
 	tx := repo.transactionContext.PgTx
 	var err error
 	var err error
@@ -78,19 +65,15 @@ func (repo *StaffAssessContentTempRepository) Save(d *domain.StaffAssessContent)
 
 
 func (repo *StaffAssessContentTempRepository) Remove(id int) error {
 func (repo *StaffAssessContentTempRepository) Remove(id int) error {
 	tx := repo.transactionContext.PgTx
 	tx := repo.transactionContext.PgTx
-	nowTime := time.Now()
-	_, err := tx.Model(&models.StaffAssessContent{}).
-		Where("id=?", id).
-		Set("deleted_at=?", nowTime).
-		Update()
+	_, err := tx.Model(&models.StaffAssessContentTemp{}).
+		Where("id=?", id).Delete()
 	return err
 	return err
 }
 }
 
 
-func (repo *StaffAssessContentTempRepository) FindOne(queryOptions map[string]interface{}) (*domain.StaffAssessContent, error) {
+func (repo *StaffAssessContentTempRepository) FindOne(queryOptions map[string]interface{}) (*domain.StaffAssessContentTemp, error) {
 	tx := repo.transactionContext.PgTx
 	tx := repo.transactionContext.PgTx
-	m := new(models.StaffAssessContent)
+	m := new(models.StaffAssessContentTemp)
 	query := tx.Model(m)
 	query := tx.Model(m)
-	query.Where("deleted_at isnull")
 	if id, ok := queryOptions["id"]; ok {
 	if id, ok := queryOptions["id"]; ok {
 		query.Where("id=?", id)
 		query.Where("id=?", id)
 	}
 	}
@@ -105,20 +88,13 @@ func (repo *StaffAssessContentTempRepository) FindOne(queryOptions map[string]in
 	return u, nil
 	return u, nil
 }
 }
 
 
-func (repo *StaffAssessContentTempRepository) Find(queryOptions map[string]interface{}) (int, []*domain.StaffAssessContent, error) {
+func (repo *StaffAssessContentTempRepository) Find(queryOptions map[string]interface{}) (int, []*domain.StaffAssessContentTemp, error) {
 	tx := repo.transactionContext.PgTx
 	tx := repo.transactionContext.PgTx
-	var m []*models.StaffAssessContent
-	query := tx.Model(&m).
-		Where("deleted_at isnull")
+	var m []*models.StaffAssessContentTemp
+	query := tx.Model(&m)
 	if companyId, ok := queryOptions["companyId"]; ok {
 	if companyId, ok := queryOptions["companyId"]; ok {
 		query.Where("company_id = ?", companyId)
 		query.Where("company_id = ?", companyId)
 	}
 	}
-	if v, ok := queryOptions["limit"].(int); ok {
-		query.Limit(v)
-	}
-	if v, ok := queryOptions["offset"].(int); ok {
-		query.Offset(v)
-	}
 	if v, ok := queryOptions["staffAssessId"]; ok {
 	if v, ok := queryOptions["staffAssessId"]; ok {
 		query.Where("staff_assess_id=?", v)
 		query.Where("staff_assess_id=?", v)
 	}
 	}
@@ -126,7 +102,7 @@ func (repo *StaffAssessContentTempRepository) Find(queryOptions map[string]inter
 	if err != nil {
 	if err != nil {
 		return 0, nil, err
 		return 0, nil, err
 	}
 	}
-	var arrays []*domain.StaffAssessContent
+	var arrays []*domain.StaffAssessContentTemp
 	for _, v := range m {
 	for _, v := range m {
 		d := repo.TransformToDomain(v)
 		d := repo.TransformToDomain(v)
 		arrays = append(arrays, d)
 		arrays = append(arrays, d)