作者 tangxvhui

调整 每日弹窗消息的显示

@@ -477,7 +477,7 @@ func (srv *MessagePersonalService) TodayMessageTaskAnomaly(param *command.GetUse @@ -477,7 +477,7 @@ func (srv *MessagePersonalService) TodayMessageTaskAnomaly(param *command.GetUse
477 msg = fmt.Sprintf("您下级负责的任务【%s】已超过%d天没反馈,有异常风险,请前往处理。", val.TaskAlias, val.Anomaly) 477 msg = fmt.Sprintf("您下级负责的任务【%s】已超过%d天没反馈,有异常风险,请前往处理。", val.TaskAlias, val.Anomaly)
478 t2 = append(t2, "反馈异常") 478 t2 = append(t2, "反馈异常")
479 } 479 }
480 - if val.AssistFlag > 0 { 480 + if val.AssistFlag > val.AssistFlagMax {
481 t += 1 481 t += 1
482 msg = fmt.Sprintf("您需辅导的任务【%s】发生异常,请前往处理", val.TaskAlias) 482 msg = fmt.Sprintf("您需辅导的任务【%s】发生异常,请前往处理", val.TaskAlias)
483 t2 = append(t2, "辅导异常") 483 t2 = append(t2, "辅导异常")
@@ -768,15 +768,16 @@ func (d *TaskDao) CountTaskIgnore(param ListTaskCondition) (int, error) { @@ -768,15 +768,16 @@ func (d *TaskDao) CountTaskIgnore(param ListTaskCondition) (int, error) {
768 } 768 }
769 769
770 type TaskData6 struct { 770 type TaskData6 struct {
771 - TaskId int `pg:"task_id"` //任务id  
772 - TaskName string `pg:"task_name"` //任务名称  
773 - TaskAlias string `pg:"task_alias"` //任务名称  
774 - LeaderName string `pg:"leader_name"` //负责人名称  
775 - LeaderId string `pg:"leader_id"` //负责人id  
776 - WarnFlag int `pg:"warn_flag"` //里程碑异常  
777 - AssistFlag int `pg:"assist_flag"` //辅导异常  
778 - Anomaly int `pg:"anomaly"` //反馈异常  
779 - RelatedUser []int `pg:"related_user"` //相关人员 771 + TaskId int `pg:"task_id"` //任务id
  772 + TaskName string `pg:"task_name"` //任务名称
  773 + TaskAlias string `pg:"task_alias"` //任务名称
  774 + LeaderName string `pg:"leader_name"` //负责人名称
  775 + LeaderId string `pg:"leader_id"` //负责人id
  776 + WarnFlag int `pg:"warn_flag"` //里程碑异常
  777 + AssistFlag int `pg:"assist_flag"` //辅导异常
  778 + AssistFlagMax int `pg:"assist_flag_max"` //辅导异常
  779 + Anomaly int `pg:"anomaly"` //反馈异常
  780 + RelatedUser []int `pg:"related_user"` //相关人员
780 } 781 }
781 782
782 // 查询每日任务异常消息弹窗需要的数据 783 // 查询每日任务异常消息弹窗需要的数据
@@ -789,6 +790,7 @@ select @@ -789,6 +790,7 @@ select
789 task.leader ->>'id' as leader_id, 790 task.leader ->>'id' as leader_id,
790 task.leader ->>'name' as leader_name, 791 task.leader ->>'name' as leader_name,
791 task.assist_flag , 792 task.assist_flag ,
  793 + task.assist_flag_max ,
792 task.warn_flag , 794 task.warn_flag ,
793 task.anomaly , 795 task.anomaly ,
794 task.related_user 796 task.related_user