作者 tangxvhui

更新

@@ -134,8 +134,6 @@ func (srv StaffAssessServeice) AssessCycleMeDesc(param *query.AssessCycleDescQue @@ -134,8 +134,6 @@ func (srv StaffAssessServeice) AssessCycleMeDesc(param *query.AssessCycleDescQue
134 } 134 }
135 case domain.LinkNodeAllInvite: 135 case domain.LinkNodeAllInvite:
136 if len(myAssessTask) > 0 { 136 if len(myAssessTask) > 0 {
137 -  
138 - }  
139 //邀请别人评估自己 137 //邀请别人评估自己
140 _, assessInviteData, err := staffAssessRepo.Find(map[string]interface{}{ 138 _, assessInviteData, err := staffAssessRepo.Find(map[string]interface{}{
141 // "staffAssessTaskId": assessTaskData.Id, 139 // "staffAssessTaskId": assessTaskData.Id,
@@ -157,10 +155,11 @@ func (srv StaffAssessServeice) AssessCycleMeDesc(param *query.AssessCycleDescQue @@ -157,10 +155,11 @@ func (srv StaffAssessServeice) AssessCycleMeDesc(param *query.AssessCycleDescQue
157 } else { 155 } else {
158 stepItem.Desc = fmt.Sprintf("截止日期:%s 待邀请%d人", stepItem.EndTime, 5-len(assessInviteData)) 156 stepItem.Desc = fmt.Sprintf("截止日期:%s 待邀请%d人", stepItem.EndTime, 5-len(assessInviteData))
159 } 157 }
  158 + }
160 case domain.LinkNodeAllAssessment: 159 case domain.LinkNodeAllAssessment:
161 //我评估别人,被邀请评估 160 //我评估别人,被邀请评估
162 _, assessInviteList, err := staffAssessRepo.Find(map[string]interface{}{ 161 _, assessInviteList, err := staffAssessRepo.Find(map[string]interface{}{
163 - // "staffAssessTaskId": assessTaskData.Id, 162 + "beginDay": param.BeginDay,
164 "executorId": param.UserId, 163 "executorId": param.UserId,
165 "typesList": []string{string(domain.AssessInviteDiffSuper), string(domain.AssessInviteSameSuper)}, 164 "typesList": []string{string(domain.AssessInviteDiffSuper), string(domain.AssessInviteSameSuper)},
166 }) 165 })
@@ -156,6 +156,9 @@ func (repo *StaffAssessRepository) Find(queryOptions map[string]interface{}) (in @@ -156,6 +156,9 @@ func (repo *StaffAssessRepository) Find(queryOptions map[string]interface{}) (in
156 if v, ok := queryOptions["endTime"]; ok { 156 if v, ok := queryOptions["endTime"]; ok {
157 query.Where("end_time<=?", v) 157 query.Where("end_time<=?", v)
158 } 158 }
  159 + if v, ok := queryOptions["beginDay"]; ok {
  160 + query.Where("to_char(staff_assess.begin_time at time zone 'PRC','YYYY-MM-DD')= ? ", v)
  161 + }
159 162
160 count, err := query.SelectAndCount() 163 count, err := query.SelectAndCount()
161 if err != nil { 164 if err != nil {