From 734e7bec7e8e409b1144af833f567fcef20cfafb Mon Sep 17 00:00:00 2001 From: tanglong <842690096@qq.com> Date: Tue, 12 Aug 2025 14:14:24 +0800 Subject: [PATCH] d --- WeChatApplet/Controllers/HomeWorkController.cs | 3 ++- WeChatApplet/Services/Impl/PatriarchService.cs | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WeChatApplet/Controllers/HomeWorkController.cs b/WeChatApplet/Controllers/HomeWorkController.cs index 4a6bb4c..cc8890b 100644 --- a/WeChatApplet/Controllers/HomeWorkController.cs +++ b/WeChatApplet/Controllers/HomeWorkController.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc; using YD_WeChatApplet.Api.Services.Impl; using YD_WeChatApplet.Commons.Dto; using YD_WeChatApplet.Commons.Dto.HomeWork; +using YD_WeChatApplet.Commons.Dto.Patriarch; using YD_WeChatApplet.Commons.Dto.School; using YD_WeChatApplet.Services; @@ -62,7 +63,7 @@ namespace YD_WeChatApplet.Api.Controllers /// /// [HttpGet("HomeWorkRecordByTeacher")] - public async Task> HomeWorkRecordByTeacher(PageDto dto) + public async Task> HomeWorkRecordByTeacher(PatriarchHomeWorkHistoryDto dto) { var res = await _homeWorkService.HomeWorkRecordByTeacher(dto); return res; diff --git a/WeChatApplet/Services/Impl/PatriarchService.cs b/WeChatApplet/Services/Impl/PatriarchService.cs index 8593a6f..22a1f4e 100644 --- a/WeChatApplet/Services/Impl/PatriarchService.cs +++ b/WeChatApplet/Services/Impl/PatriarchService.cs @@ -184,7 +184,6 @@ namespace YD_WeChatApplet.Api.Services.Impl /// 学生报告 /// /// - /// public async Task StudentReport() { var res = new StudentReportDto(); @@ -309,13 +308,13 @@ namespace YD_WeChatApplet.Api.Services.Impl Amount = x.Amount ?? 0, Duration = x.Duration ?? 0, Calorie = x.Calorie ?? 0 - }) .OrderByDescending(x => x.EndTime) .Skip((dto.PageIndex - 1) * dto.PageSize) .Take(dto.PageSize) .ToListAsync(); + return new PageDataDto { Total = totalCount,