From 3d8841f84c94d93349fb471d0435289e540d5143 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 27 十月 2023 16:14:53 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
index aba1585..cae2ee6 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
@@ -3,6 +3,7 @@
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsh.course.entity.*;
@@ -53,6 +54,50 @@
@Resource
private CoursePackageSchedulingMapper coursePackageSchedulingService;
+
+
+
+
+ @RequestMapping("/getStudentTotal")
+ @ResponseBody
+ public List<Map<String, Object>> get(@RequestBody StudentQeryDto studentQeryDto) {
+ System.out.println("-====studentQeryDto========="+studentQeryDto);
+ List<Map<String, Object>> pays = paymentService.getStudentTotal(studentQeryDto);
+ System.out.println("=========pays======"+pays);
+
+ return pays;
+
+ }
+
+
+ @RequestMapping("/bypac")
+ @ResponseBody
+ public List<Map<String, Object>> bypac(@RequestBody PacQueryDto pacQueryDto) {
+
+
+
+
+
+ System.out.println("-====studentQeryDto========="+pacQueryDto);
+ List<Map<String, Object>> pays = paymentService.bypac(pacQueryDto);
+ System.out.println("=========pays======"+pays);
+
+ return pays;
+
+ }
+
+ @ResponseBody
+ @PostMapping("/queryIdsByStore")
+ public List<Integer> queryIdsByStore(@RequestBody Integer objectId){
+ List<TCoursePackage> list = packageService.list(new LambdaQueryWrapper<TCoursePackage>().eq(TCoursePackage::getStoreId, objectId));
+ List<Integer> collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
+ return collect;
+ }
+
+
//获取学员课时数信息
@RequestMapping("/getInfo")
@ResponseBody
@@ -701,6 +746,8 @@
System.out.println("保存成功=============》="+holi);
+
+
TCoursePackage tCoursePackage = packageService.getById(toHoliDto.getClassId());
String classWeeks = tCoursePackage.getClassWeeks();
List<Integer> week = week(classWeeks);
@@ -825,10 +872,6 @@
String join = StringUtils.join(stringArray, ",");
System.out.println("==========join========"+join);
return "转课成功";
-
-
-
-
}
--
Gitblit v1.7.1