修改bug

liujie

2023-10-26 e030255c23c7ba3e2cbad1036a810d6d72fa864f

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java

@@ -2,7 +2,9 @@


import com.dsh.course.dto.*;
import com.dsh.course.entity.EvaluateStudent;
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,11 +22,13 @@
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;
import io.swagger.models.auth.In;
import org.apache.ibatis.annotations.Param;
import org.bouncycastle.math.raw.Mod;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpRequest;
import org.springframework.stereotype.Controller;
@@ -41,10 +45,7 @@
import java.math.RoundingMode;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * 控制器
@@ -104,7 +105,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);
@@ -118,7 +119,9 @@
     * 跳转到首页
     */
    @RequestMapping("")
    public String index() {
    public String index(Model model) {
        Integer objectType = UserExt.getUser().getObjectType();
        model.addAttribute("objectType",objectType);
        return PREFIX + "tStudent.html";
    }

@@ -173,7 +176,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 +196,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 +305,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";
    }




//
@@ -323,10 +340,120 @@
    @RequestMapping("/list")
    @ResponseBody
    public List<TStudentDto> list(StudentSearch search) {
        List<Integer> ids = new ArrayList<>();

        if(UserExt.getUser().getObjectType()==3){
            ids = appUserClient.getUserStore(UserExt.getUser().getObjectId());
            if(ids.size()==0){
                ids.add(-1);
            }
            search.setIds(ids);
        }
        if(UserExt.getUser().getObjectType()==2){
            ids = appUserClient.getUserYYs(UserExt.getUser().getObjectId());
            if(ids.size()==0){
                ids.add(-1);
            }
            search.setIds(ids);
        }
        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;
    }


    @RequestMapping("/addcom/{id}")
    @ResponseBody
    public ResultUtil addcom(@PathVariable("id") Integer id,String content,String image) {

        EvaluateStudent evaluateStudent = new EvaluateStudent();
        evaluateStudent.setStudentId(id);
        evaluateStudent.setContent(content);
        evaluateStudent.setImgs(image);
//        evaluateStudent.setInsertTime(new Date());


        appUserClient.save(evaluateStudent);
//        evaluateStudentService.save(evaluateStudent);



        return new ResultUtil<>(0,0,"保存成功",null,null);
    }



    @RequestMapping("/updatecom")
    @ResponseBody
    public ResultUtil updatecom(Integer id,String content,String images) {

        EvaluateStudent evaluateStudent = new EvaluateStudent();
        evaluateStudent.setId(id);
        evaluateStudent.setContent(content);
        evaluateStudent.setImgs(images);
        appUserClient.save(evaluateStudent);

//        evaluateStudentService.updateById(evaluateStudent);



        return new ResultUtil<>(0,0,"修改成功",null,null);
    }


    @RequestMapping("/comdel/{id}")
    @ResponseBody
    public ResultUtil comdel(@PathVariable("id") Integer id) {


        appUserClient.comdel(id);

//        evaluateStudentService.removeById(id);



        return new ResultUtil<>(0,0,"删除成功",null,null);
    }


    @RequestMapping("/frozen")
    @ResponseBody

    public ResultUtil forzen(Integer id,Integer state){

            TStudent student = new TStudent();
            student.setId(id);
            student.setState(state);


            studentClient.frozen(student);


            return ResultUtil.success();

    }


    /**
     * 获取列表
@@ -360,6 +487,8 @@
        return ResultUtil.success();
    }

//同意退款

    @RequestMapping("/changeStatus/{id}")
    @ResponseBody
    public ResultUtil changeStatus(@PathVariable Integer id) {
@@ -375,6 +504,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 +574,7 @@
        historyClient.createHistory(historyDto);


        return ResultUtil.success();
        return new ResultUtil<>(0,0,"更改成功",null,null);

    }

@@ -453,7 +597,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 +610,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 +680,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 +707,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);