From 1863e6353f0de84082a21738f5d0a28f3cfeadc0 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期三, 22 十一月 2023 19:33:49 +0800 Subject: [PATCH] 后台bug修改 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 36 +++++++++++++++++++++++++++--------- 1 files changed, 27 insertions(+), 9 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 6164351..455abe7 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 @@ -1,6 +1,7 @@ package com.dsh.guns.modular.system.controller.system; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsh.course.dto.*; import com.dsh.course.entity.EvaluateStudent; @@ -10,6 +11,7 @@ import com.dsh.course.feignClient.competition.CompetitionClient; import com.dsh.course.feignClient.competition.model.ListQuery; import com.dsh.course.feignClient.course.CoursePackageClient; +import com.dsh.course.feignClient.course.CoursePackagePaymentClient; import com.dsh.course.feignClient.course.CourseStuddentClient; import com.dsh.course.feignClient.course.model.TCoursePackage; import com.dsh.course.feignClient.course.model.TCoursePackagePayment; @@ -24,10 +26,7 @@ import com.dsh.guns.core.base.controller.BaseController; import com.dsh.guns.modular.system.model.*; import com.dsh.guns.modular.system.model.dto.*; -import com.dsh.guns.modular.system.service.EvaluateStudentService; -import com.dsh.guns.modular.system.service.ISiteBookingService; -import com.dsh.guns.modular.system.service.IStoreService; -import com.dsh.guns.modular.system.service.ITStudentService; +import com.dsh.guns.modular.system.service.*; import com.dsh.guns.modular.system.util.BigDecimalToChineseAmountUtil; import com.dsh.guns.modular.system.util.ResultUtil; import io.swagger.models.auth.In; @@ -76,6 +75,10 @@ private IStoreService storeService; @Autowired private CompetitionClient competitionClient; + @Autowired + private ICityService cityService; + @Autowired + private CoursePackagePaymentClient coursePackagePaymentClient; @RequestMapping("download") public void down(HttpServletRequest request, HttpServletResponse response) throws IOException { @@ -130,6 +133,8 @@ public String index(Model model) { Integer objectType = UserExt.getUser().getObjectType(); model.addAttribute("objectType",objectType); + List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0)); + model.addAttribute("list",list); return PREFIX + "tStudent.html"; } @@ -287,6 +292,19 @@ System.out.println("======>t"+tStudentId); //查询学员信息 TStudentDto tStudentDto = itStudentService.listOne(tStudentId); + // 查询该学员第一次购买课包的时间 + String time = coursePackagePaymentClient.getTime(tStudentId); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + try { + if (time!=null){ + Date parse = format.parse(time); + tStudentDto.setTime(parse); + } + } catch (ParseException e) { + e.printStackTrace(); + } + + model.addAttribute("item", tStudentDto); if (tStudentDto.getLateralSurface()!=null) { String[] pics = tStudentDto.getLateralSurface().split(";"); @@ -445,15 +463,15 @@ @RequestMapping("/updatecom") @ResponseBody - public ResultUtil updatecom(Integer id,String content,String images) { + public ResultUtil updatecom(@RequestBody StudentPingYuDTO dto) { EvaluateStudent evaluateStudent = new EvaluateStudent(); - evaluateStudent.setId(id); - evaluateStudent.setContent(content); - evaluateStudent.setImgs(images); + evaluateStudent.setId(dto.getId()); + evaluateStudent.setContent(dto.getContent()); + evaluateStudent.setImgs(dto.getImages()); appUserClient.save(evaluateStudent); - evaluateStudentService.updateById(evaluateStudent); +// evaluateStudentService.updateById(evaluateStudent); -- Gitblit v1.7.1