fix(be): 任务完成统计与留痕改用 PlanTask(DailyTask 已空)
- TogglePlanTask:完成无 sheet_type 的任务时补一条 note 记录, 首页/计划页两条路径都统一留痕(ToggleTask 委托它);去掉前端重复建记录 - 报告页「完成任务」原来统计空的 DailyTask 恒为 0,改成经 plan 关联 统计 PlanTask 本周完成数;用户汇总的 tasksDone 同改 - 首页今日完成度 todayCompletionPct 同样从 DailyTask 改成今日 PlanTask Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -180,14 +180,22 @@ func (s *Service) datesWithActivity(petID string, start, end time.Time) map[stri
|
||||
}
|
||||
|
||||
func (s *Service) todayCompletionPct(petID string, now time.Time) int {
|
||||
start := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
|
||||
end := start.AddDate(0, 0, 1)
|
||||
// 任务是 PlanTask(DailyTask 已空)。取宠物的 active 30 天计划,算今天那天的完成占比
|
||||
var plan model.Plan
|
||||
if s.db.Where("pet_id = ? AND kind = ? AND status = ?", petID, model.PlanThirtyDay, "active").
|
||||
Order("id desc").First(&plan).Error != nil {
|
||||
return 0
|
||||
}
|
||||
day := dayIndexOf(&plan, now)
|
||||
if day < 0 {
|
||||
return 0
|
||||
}
|
||||
var total, done int64
|
||||
s.db.Model(&model.DailyTask{}).Where("pet_id = ? AND task_date >= ? AND task_date < ?", petID, start, end).Count(&total)
|
||||
s.db.Model(&model.PlanTask{}).Where("plan_id = ? AND day = ?", plan.ID, day).Count(&total)
|
||||
if total == 0 {
|
||||
return 0
|
||||
}
|
||||
s.db.Model(&model.DailyTask{}).Where("pet_id = ? AND task_date >= ? AND task_date < ? AND done = ?", petID, start, end, true).Count(&done)
|
||||
s.db.Model(&model.PlanTask{}).Where("plan_id = ? AND day = ? AND done = ?", plan.ID, day, true).Count(&done)
|
||||
return int(math.Round(float64(done) / float64(total) * 100))
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,16 @@ func (s *Service) TogglePlanTask(userID, taskID string) error {
|
||||
if err := s.db.Where("id = ? AND user_id = ?", pt.PlanID, userID).First(&plan).Error; err != nil {
|
||||
return ErrNotFound
|
||||
}
|
||||
return s.db.Model(&model.PlanTask{}).Where("id = ?", taskID).Update("done", !pt.Done).Error
|
||||
newDone := !pt.Done
|
||||
if err := s.db.Model(&model.PlanTask{}).Where("id = ?", taskID).Update("done", newDone).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
// 勾选完成、且没关联记录类型的任务(自定义/无 sheet_type),补一条 note 记录,
|
||||
// 让最近记录里留痕。有 sheet_type 的任务是走记录表单单独落记录的,这里不重复。
|
||||
if newDone && pt.SheetType == "" {
|
||||
_, _ = s.CreateRecord(userID, plan.PetID, RecordInput{Type: "note", Title: "完成:" + pt.Title})
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// newStagePlan 按宠物当前阶段的养护模板生成一份 30 天计划(未保存)
|
||||
|
||||
@@ -26,9 +26,10 @@ func (s *Service) GetWeeklyReport(userID, petID string) (*WeeklyReport, error) {
|
||||
}
|
||||
weekAgo := time.Now().AddDate(0, 0, -7)
|
||||
|
||||
// 任务已并成 PlanTask(DailyTask 表已空),要经 plan 关联到宠物来统计本周完成数
|
||||
var tasksCompleted int64
|
||||
s.db.Model(&model.DailyTask{}).
|
||||
Where("pet_id = ? AND done = ? AND updated_at >= ?", petID, true, weekAgo).
|
||||
s.db.Model(&model.PlanTask{}).
|
||||
Where("plan_id IN (SELECT id FROM sundynix_plans WHERE pet_id = ?) AND done = ? AND updated_at >= ?", petID, true, weekAgo).
|
||||
Count(&tasksCompleted)
|
||||
|
||||
// 体重增长:最近 7 天最新 - 最早
|
||||
@@ -215,7 +216,9 @@ func (s *Service) GetPoster(userID, petID string) (*Poster, error) {
|
||||
return nil, err
|
||||
}
|
||||
var tasksDone, weightRecs, vaccineRecs int64
|
||||
s.db.Model(&model.DailyTask{}).Where("pet_id = ? AND done = ?", petID, true).Count(&tasksDone)
|
||||
s.db.Model(&model.PlanTask{}).
|
||||
Where("plan_id IN (SELECT id FROM sundynix_plans WHERE pet_id = ?) AND done = ?", petID, true).
|
||||
Count(&tasksDone)
|
||||
s.db.Model(&model.HealthRecord{}).Where("pet_id = ? AND type = ?", petID, model.RecordWeight).Count(&weightRecs)
|
||||
s.db.Model(&model.HealthRecord{}).Where("pet_id = ? AND type = ?", petID, model.RecordVaccine).Count(&vaccineRecs)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user