From f6ba3e15355e22767e69f8fc14ae22523f8db8dc Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
index a430d19..385959a 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
@@ -1,13 +1,14 @@
package com.dsh.account.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.account.dto.*;
+import com.dsh.account.entity.GiftSearchDto;
import com.dsh.account.entity.TStudent;
import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
import com.dsh.account.feignclient.course.model.RecordAppoint;
import com.dsh.account.feignclient.other.model.StoreDetailList;
import com.dsh.account.feignclient.other.model.StoreInfo;
import com.dsh.account.feignclient.other.model.SysNotice;
-import com.dsh.account.model.vo.classDetails.AppointmentRecordVo;
import com.dsh.account.model.vo.classDetails.ClasspaymentRequest;
import com.dsh.account.model.vo.classDetails.StuEditInfoReq;
import com.dsh.account.model.vo.classDetails.classInsVo.ClassDetailsInsVo;
@@ -22,6 +23,7 @@
import com.dsh.account.util.ResultUtil;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -85,7 +87,7 @@
* @param appUserId
* @return
*/
- List<RecordAppoint> getAppointmentRecords(Integer stuId, Integer appUserId, Integer appointStatus, Integer timeType, String search);
+ List<RecordAppoint> getAppointmentRecords(Integer stuId, Integer appUserId, Integer appointStatus, Integer timeType, String search,Integer pageNum);
ResultUtil cancelReservationOfCourse( Integer courseStuRecordId);
@@ -101,4 +103,17 @@
ResultUtil commitEditStudentInfo(StuEditInfoReq stu, Integer userIdFormRedis);
+
+ List<TStudentDto> listAll( StudentSearch search);
+
+ TStudentDto listOne(Integer id);
+
+ void createHistory(CreateHistoryDto createHistoryDto);
+
+ List<GetHistoryDto> getHistory();
+
+
+ Integer getGiftSelect(GiftSearchDto giftSearchDto);
+
+ List<Map<String, Object>> queryCom(Integer id);
}
--
Gitblit v1.7.1