From b63785e94f5777080fc8cba1c7b6e112cca01617 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 13 十月 2023 11:05:55 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 11 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
index 5373667..8d27bb2 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
@@ -3,6 +3,7 @@
import com.dsh.course.dto.*;
import com.dsh.course.feignClient.account.AppUserClient;
+import com.dsh.course.feignClient.account.StudentClient;
import com.dsh.course.feignClient.account.model.TAppUser;
import com.dsh.course.feignClient.course.CoursePackageClient;
import com.dsh.course.feignClient.course.CourseStuddentClient;
@@ -20,6 +21,7 @@
import com.dsh.guns.modular.system.model.TStudent;
import com.dsh.guns.modular.system.model.User;
import com.dsh.guns.modular.system.model.dto.*;
+import com.dsh.guns.modular.system.service.EvaluateStudentService;
import com.dsh.guns.modular.system.service.ITStudentService;
import com.dsh.guns.modular.system.util.BigDecimalToChineseAmountUtil;
import com.dsh.guns.modular.system.util.ResultUtil;
@@ -104,7 +106,7 @@
*/
@RequestMapping("/changelist/{payId}")
@ResponseBody
- public ResultUtil changelist(@PathVariable("payId") Integer payId, ConsumeQuery consumeQuery) {
+ public ResultUtil changelist(@PathVariable("payId") Long payId, ConsumeQuery consumeQuery) {
consumeQuery.setPayId(payId);
System.out.println("=======changelist==========="+consumeQuery);
List<CourseCounsum> courseCounsums = courseStuddentClient.queryCounsum(consumeQuery);
@@ -173,7 +175,6 @@
model.addAttribute("id", id);
model.addAttribute("ids", ids);
-
TAppUser tAppUser = appUserClient.queryById(tStudentDto.getAppUserId());
model.addAttribute("userName",tAppUser.getName());
model.addAttribute("tStudentDto",tStudentDto);
@@ -194,6 +195,9 @@
payment.setId(Long.valueOf(tCoursePackage.getId()));
BigDecimal cashPayment = payment.getCashPayment();
+ if (cashPayment==null){
+ cashPayment = BigDecimal.ZERO;
+ }
Integer totalClassHours = payment.getTotalClassHours();
BigDecimal result = new BigDecimal(0);
if (totalClassHours!=0) {
@@ -300,6 +304,18 @@
}
+ @Autowired
+ private EvaluateStudentService evalstuService;
+
+ @RequestMapping("/tStudent_commite/{tStudentId}")
+ public String tStudent_commite(@PathVariable("tStudentId") Integer tStudentId, Model model) {
+
+ model.addAttribute("id",tStudentId);
+
+ return PREFIX + "tStudent_commite.html";
+ }
+
+
//
@@ -327,6 +343,29 @@
System.out.println("============学员查询接口=========");
return itStudentService.listAll(search);
}
+
+
+
+
+ @Autowired
+ private EvaluateStudentService evaluateStudentService;
+
+ @Resource
+ private StudentClient studentClient;
+ /**
+ * 获取列表
+ */
+ @RequestMapping("/listcom/{id}")
+ @ResponseBody
+ public List<Map<String,Object>> listcom(@PathVariable("id") Integer id) {
+
+ List<Map<String,Object>> maps = studentClient.listCom(id);
+
+
+
+ return maps;
+ }
+
/**
* 获取列表
@@ -360,6 +399,8 @@
return ResultUtil.success();
}
+//同意退款
+
@RequestMapping("/changeStatus/{id}")
@ResponseBody
public ResultUtil changeStatus(@PathVariable Integer id) {
@@ -375,6 +416,21 @@
return new ResultUtil<>(0,0,"同意成功",null,null);
}
+ @RequestMapping("/noStatus/{id}")
+ @ResponseBody
+ public ResultUtil noStatus(@PathVariable Integer id) {
+// InsertBackDto insertBackDto= new InsertBackDto();
+// insertBackDto.setId(id);
+//// insertBackDto.setIds(ids);
+// System.out.println("=====insertBackDto========"+insertBackDto);
+
+ courseStuddentClient.changeStatus(id);
+ courseStuddentClient.backStausClass(id);
+// courseStuddentClient.zeroClass(id);
+
+ System.out.println("============学员查询接口=========");
+ return new ResultUtil<>(0,0,"同意成功",null,null);
+ }
/**
* 学员修改
@@ -430,7 +486,7 @@
historyClient.createHistory(historyDto);
- return ResultUtil.success();
+ return new ResultUtil<>(0,0,"更改成功",null,null);
}
@@ -453,7 +509,7 @@
*/
@RequestMapping(value = "/getUserSlect/{id}")
@ResponseBody
- public ResultUtil getUserSlect(@PathVariable("id") Integer payId) {
+ public ResultUtil getUserSlect(@PathVariable("id") Long payId) {
List<SelectDto> selectDtos = courseStuddentClient.getSelect(payId);
Map<String,List<SelectDto>> map = new HashMap<>();
@@ -466,7 +522,7 @@
*/
@RequestMapping(value = "/toClass")
@ResponseBody
- public ResultUtil toClass( Integer id,Integer toStudentId) {
+ public ResultUtil toClass( Long id,Integer toStudentId) {
ToClassDto toClassDto = new ToClassDto();
toClassDto.setToStudentId(toStudentId);
toClassDto.setId(id);
@@ -536,10 +592,11 @@
System.out.println("========ToHoliDto========="+resultUtil);
- if (resultUtil==""){
+ if (resultUtil==""||resultUtil==null){
return new ResultUtil<>(0,0,"报名成功");
- }else
- return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);
+ }else{
+ return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);}
+
}
@@ -562,15 +619,15 @@
if (resultUtil==""){
return new ResultUtil<>(0,0,"报名成功");
- }else
- return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);
+ }else{
+ return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);}
}
//赠课
@RequestMapping(value = "/giftTo")
@ResponseBody
- public ResultUtil toClagiftToss( Integer id,Integer toStudentId) {
+ public ResultUtil toClagiftToss( Long id,Integer toStudentId) {
ToClassDto toClassDto = new ToClassDto();
toClassDto.setToStudentId(toStudentId);
toClassDto.setId(id);
--
Gitblit v1.7.1