Merge branch 'test' into dev-tangxvhui

@@ -3,6 +3,7 @@ package service
 import (
 import (
 	"fmt"
 	"fmt"
 	"strconv"
 	"strconv"
+	"strings"
 	"time"
 	"time"
 
 
 	service "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/role"
 	service "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/role"
@@ -1250,8 +1251,15 @@ func (srv StaffAssessServeice) SaveSelfAssess(in *command.SaveSelfAssessCommand)
 			for i := range taskRecords {
 			for i := range taskRecords {
 				it := taskRecords[i]
 				it := taskRecords[i]
 				if v, ok := recordMap[it.Id]; ok {
 				if v, ok := recordMap[it.Id]; ok {
-					it.AssistLevel = v.AssistLevel             // 更新上级辅导情况
-					it.AssistContent = v.AssistContent         // 更新上级辅导内容
+					it.AssistLevel = v.AssistLevel     // 更新上级辅导情况
+					it.AssistContent = v.AssistContent // 更新上级辅导内容
+					// 去掉前后空格进行判断
+					trimSpace := strings.TrimSpace(v.AssistContent)
+					if len(trimSpace) == 0 || trimSpace == "无" {
+						it.AnomalyState = domain.AnomalyState0
+					} else {
+						it.AnomalyState = domain.AnomalyState1
+					}
 					if v.TaskStageId == it.TaskStageCheck.Id { // 更新里程碑状态
 					if v.TaskStageId == it.TaskStageCheck.Id { // 更新里程碑状态
 						if v.Check == domain.TaskStageUncompleted {
 						if v.Check == domain.TaskStageUncompleted {
 							it.TaskStageCheck.RealCompletedAt = 0
 							it.TaskStageCheck.RealCompletedAt = 0

@@ -895,9 +895,9 @@ func (srv TaskService) ReplyTaskStage(transactionContext application.Transaction
 		if err != nil {
 		if err != nil {
 			return application.ThrowError(application.INTERNAL_SERVER_ERROR, "找不到任务数据"+err.Error())
 			return application.ThrowError(application.INTERNAL_SERVER_ERROR, "找不到任务数据"+err.Error())
 		}
 		}
-		// if !(len(val.AssistContent) == 0 || val.AssistContent == "无") {
-		// 	taskData.Anomaly = 0
-		// }
+		if val.AnomalyState == domain.AnomalyState1 {
+			taskData.Anomaly = 0
+		}
 		taskList = append(taskList, taskData)
 		taskList = append(taskList, taskData)
 		_, stageList, err := taskStageRepo.Find(map[string]interface{}{"ids": []int{val.TaskStageCheck.Id}})
 		_, stageList, err := taskStageRepo.Find(map[string]interface{}{"ids": []int{val.TaskStageCheck.Id}})
 		if err != nil {
 		if err != nil {

@@ -9,6 +9,11 @@ const (
 	AssistLevel4 int = 4 // 已辅导-辅导对里程碑作用很好
 	AssistLevel4 int = 4 // 已辅导-辅导对里程碑作用很好
 )
 )
 
 
+const (
+	AnomalyState0 int = 0 // 异常
+	AnomalyState1 int = 1 // 正常
+)
+
 // TaskRecord 任务反馈情况记录
 // TaskRecord 任务反馈情况记录
 type TaskRecord struct {
 type TaskRecord struct {
 	Id             int         `json:"id,string" comment:"记录ID"`
 	Id             int         `json:"id,string" comment:"记录ID"`
@@ -21,6 +26,7 @@ type TaskRecord struct {
 	TaskLeader     TaskLeader  `json:"taskLeader" comment:"任务负责人"`
 	TaskLeader     TaskLeader  `json:"taskLeader" comment:"任务负责人"`
 	AssistLevel    int         `json:"assistLevel" comment:"上级辅导情况"`
 	AssistLevel    int         `json:"assistLevel" comment:"上级辅导情况"`
 	AssistContent  string      `json:"assistContent" comment:"上级辅导内容"`
 	AssistContent  string      `json:"assistContent" comment:"上级辅导内容"`
+	AnomalyState   int         `json:"anomalyState" comment:"异常反馈状态（0异常、1正常）"`
 	TaskStages     []TaskStage `json:"taskStages" comment:"里程碑列表"`
 	TaskStages     []TaskStage `json:"taskStages" comment:"里程碑列表"`
 	TaskStageCheck TaskStage   `json:"taskStageCheck" comment:"提交的里程碑"`
 	TaskStageCheck TaskStage   `json:"taskStageCheck" comment:"提交的里程碑"`
 	CreatedAt      time.Time   `json:"createdAt" comment:"创建时间"`
 	CreatedAt      time.Time   `json:"createdAt" comment:"创建时间"`

@@ -16,8 +16,9 @@ type TaskRecord struct {
 	TaskName       string             `comment:"任务名称"`
 	TaskName       string             `comment:"任务名称"`
 	TaskAlias      string             `comment:"任务别名"`
 	TaskAlias      string             `comment:"任务别名"`
 	TaskLeader     domain.TaskLeader  `comment:"任务负责人"`
 	TaskLeader     domain.TaskLeader  `comment:"任务负责人"`
-	AssistLevel    int                `comment:"上级辅导情况"`
+	AssistLevel    int                `comment:"上级辅导情况" pg:",use_zero"`
 	AssistContent  string             `comment:"上级辅导内容"`
 	AssistContent  string             `comment:"上级辅导内容"`
+	AnomalyState   int                `comment:"异常反馈状态" pg:",use_zero"`
 	TaskStages     []domain.TaskStage `comment:"里程碑列表"`
 	TaskStages     []domain.TaskStage `comment:"里程碑列表"`
 	TaskStageCheck domain.TaskStage   `comment:"提交的里程碑"`
 	TaskStageCheck domain.TaskStage   `comment:"提交的里程碑"`
 	CreatedAt      time.Time          `comment:"创建时间"`
 	CreatedAt      time.Time          `comment:"创建时间"`

@@ -32,6 +32,7 @@ func (repo *TaskRecordRepository) TransformToDomain(m *models.TaskRecord) domain
 		TaskLeader:     m.TaskLeader,
 		TaskLeader:     m.TaskLeader,
 		AssistLevel:    m.AssistLevel,
 		AssistLevel:    m.AssistLevel,
 		AssistContent:  m.AssistContent,
 		AssistContent:  m.AssistContent,
+		AnomalyState:   m.AnomalyState,
 		TaskStages:     m.TaskStages,
 		TaskStages:     m.TaskStages,
 		TaskStageCheck: m.TaskStageCheck,
 		TaskStageCheck: m.TaskStageCheck,
 		CreatedAt:      m.CreatedAt.Local(),
 		CreatedAt:      m.CreatedAt.Local(),
@@ -52,6 +53,7 @@ func (repo *TaskRecordRepository) TransformToModel(d *domain.TaskRecord) models.
 		TaskLeader:     d.TaskLeader,
 		TaskLeader:     d.TaskLeader,
 		AssistLevel:    d.AssistLevel,
 		AssistLevel:    d.AssistLevel,
 		AssistContent:  d.AssistContent,
 		AssistContent:  d.AssistContent,
+		AnomalyState:   d.AnomalyState,
 		TaskStages:     d.TaskStages,
 		TaskStages:     d.TaskStages,
 		TaskStageCheck: d.TaskStageCheck,
 		TaskStageCheck: d.TaskStageCheck,
 		CreatedAt:      d.CreatedAt,
 		CreatedAt:      d.CreatedAt,