作者 郑周

Merge branch 'dev-zhengzhou' into test

@@ -916,10 +916,6 @@ func (srv TaskService) ListTaskRecord(param *command.ListTaskRecordCommand) (map @@ -916,10 +916,6 @@ func (srv TaskService) ListTaskRecord(param *command.ListTaskRecordCommand) (map
916 nowDay := time.Now().Format("2006-01-02") 916 nowDay := time.Now().Format("2006-01-02")
917 for _, val := range taskRecordList { 917 for _, val := range taskRecordList {
918 recordCreatedAt := val.CreatedAt.Local().Format("2006-01-02") 918 recordCreatedAt := val.CreatedAt.Local().Format("2006-01-02")
919 - if nowDay == recordCreatedAt && val.AnomalyState != domain.AnomalyState1 {  
920 - cnt = cnt - 1  
921 - continue  
922 - }  
923 item := adapter.TaskRecordAdapter{ 919 item := adapter.TaskRecordAdapter{
924 Id: val.Id, 920 Id: val.Id,
925 StaffAssessId: val.StaffAssessId, 921 StaffAssessId: val.StaffAssessId,
@@ -945,6 +941,9 @@ func (srv TaskService) ListTaskRecord(param *command.ListTaskRecordCommand) (map @@ -945,6 +941,9 @@ func (srv TaskService) ListTaskRecord(param *command.ListTaskRecordCommand) (map
945 if val.AnomalyState == domain.AnomalyStateInit { 941 if val.AnomalyState == domain.AnomalyStateInit {
946 item.AnomalyState = domain.AnomalyState0 942 item.AnomalyState = domain.AnomalyState0
947 } 943 }
  944 + if nowDay == recordCreatedAt {
  945 + item.AnomalyState = domain.AnomalyState1
  946 + }
948 t1 := time.Unix(val.TaskStageCheck.PlanCompletedAt, 0).Local().Format("2006-01-02") 947 t1 := time.Unix(val.TaskStageCheck.PlanCompletedAt, 0).Local().Format("2006-01-02")
949 item.TaskStageCheck.PlanCompletedAt = t1 948 item.TaskStageCheck.PlanCompletedAt = t1
950 if val.TaskStageCheck.RealCompletedAt > 0 { 949 if val.TaskStageCheck.RealCompletedAt > 0 {