Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-10-13 b63785e94f5777080fc8cba1c7b6e112cca01617

 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;
@@ -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);
@@ -303,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";
    }




//
@@ -330,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;
    }


    /**
     * 获取列表
@@ -558,8 +594,9 @@

        if (resultUtil==""||resultUtil==null){
            return new ResultUtil<>(0,0,"报名成功");
        }else
        return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);
        }else{
        return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);}

    }


@@ -582,8 +619,8 @@

        if (resultUtil==""){
            return new ResultUtil<>(0,0,"报名成功");
        }else
            return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);
        }else{
            return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);}
    }

    //赠课