11.29

nickchange

2023-11-29 d4fbea2ac7f7c98ffd83480f8f2535ca92f3baea

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

@@ -260,17 +260,19 @@
        //查询学员信息
        TStudentDto tStudentDto = itStudentService.listOne(tStudentId);
        model.addAttribute("item", tStudentDto);
        if (tStudentDto.getLateralSurface()!=null) {
        if (tStudentDto.getLateralSurface()!=null&&!tStudentDto.getLateralSurface().equals("")) {
            String[] pics = tStudentDto.getLateralSurface().split(";");
            model.addAttribute("pic1", pics[0]);
            System.out.println("=====pic1==" + pics[0]);
            if (pics.length > 1) {
                model.addAttribute("pic2", pics[1]);
                System.out.println("=====pic2==" + pics[1]);
            }
            if (pics.length > 2) {
                model.addAttribute("pic3", pics[2]);
                System.out.println("=====pic3==" + pics[2]);
            if (pics.length>0) {
                model.addAttribute("pic1", pics[0]);
                System.out.println("=====pic1==" + pics[0]);
                if (pics.length > 1) {
                    model.addAttribute("pic2", pics[1]);
                    System.out.println("=====pic2==" + pics[1]);
                }
                if (pics.length > 2) {
                    model.addAttribute("pic3", pics[2]);
                    System.out.println("=====pic3==" + pics[2]);
                }
            }
        }

@@ -306,18 +308,19 @@


        model.addAttribute("item", tStudentDto);
        if (tStudentDto.getLateralSurface()!=null) {
            String[] pics = tStudentDto.getLateralSurface().split(";");
            model.addAttribute("pic1", pics[0]);
            System.out.println("=====pic1==" + pics[0]);
            if (pics.length > 1) {
                model.addAttribute("pic2", pics[1]);
                System.out.println("=====pic2==" + pics[1]);
            }
            if (pics.length > 2) {
                model.addAttribute("pic3", pics[2]);
                System.out.println("=====pic3==" + pics[2]);
            }
        if (tStudentDto.getLateralSurface()!=null&&!tStudentDto.equals("")) {
//            String[] pics = tStudentDto.getLateralSurface().split(";");
//            model.addAttribute("pic1", pics[0]);
//            System.out.println("=====pic1==" + pics[0]);
//            if (pics.length > 1) {
//                model.addAttribute("pic2", pics[1]);
//                System.out.println("=====pic2==" + pics[1]);
//            }
//            if (pics.length > 2) {
//                model.addAttribute("pic3", pics[2]);
//                System.out.println("=====pic3==" + pics[2]);
//            }
            model.addAttribute("images",tStudentDto.getLateralSurface());
        }


@@ -353,9 +356,11 @@
    @RequestMapping("/getUseTime/{tStudentId}")
    @ResponseBody
    public ResultUtil getMax(@PathVariable("tStudentId") Integer tStudentId) {
        Date useTime = courseStuddentClient.getUseTime(tStudentId);
        Date vali = studentClient.getById(tStudentId);

//        Date useTime = courseStuddentClient.getUseTime(tStudentId);
        Map<String, Date> map = new HashMap<>();
        map.put("useTime",useTime);
        map.put("useTime",vali);

        return new ResultUtil<>(0,0,null,map,null);
    }
@@ -434,8 +439,6 @@

        List<Map<String,Object>> maps =   studentClient.listCom(id);



        return maps;
    }

@@ -450,7 +453,8 @@
        evaluateStudent.setImgs(image);
//        evaluateStudent.setInsertTime(new Date());


        User user = UserExt.getUser();
        evaluateStudent.setCoachId(user.getId());
        appUserClient.save(evaluateStudent);
//        evaluateStudentService.save(evaluateStudent);

@@ -521,12 +525,14 @@
        // 需要过滤体验课
        List<ClassListDto> classListDtos = courseStuddentClient.listClass(tStudentId);
        for (ClassListDto classListDto : classListDtos) {
            classListDto.setHasClassHours(classListDto.getTotalClassHours()-classListDto.getLaveClassHours());
            if (classListDto.getClassType()==2){
                classListDto.setTotalClassHours(null);
                classListDto.setHasClassHours(null);
                classListDto.setLaveClassHours(null);
                continue;
            }
            classListDto.setHasClassHours(classListDto.getTotalClassHours()-classListDto.getLaveClassHours());

        }
        Map<String,List<ClassListDto>> map = new HashMap<>();
        map.put("items",classListDtos);
@@ -578,7 +584,7 @@
////        insertBackDto.setIds(ids);
//        System.out.println("=====insertBackDto========"+insertBackDto);

        courseStuddentClient.changeStatus(id);
        courseStuddentClient.noStatus(id);
        courseStuddentClient.backStausClass(id);
//        courseStuddentClient.zeroClass(id);

@@ -593,11 +599,25 @@
    @ResponseBody

    public ResultUtil update(@RequestBody TStudent tStudent) {
        String lateralSurface = tStudent.getImage1()+";"+tStudent.getImage2()+";"+tStudent.getImage3();
        List<String> strings = new ArrayList<>();
        if (!tStudent.getImage1().isEmpty()){
            strings.add(tStudent.getImage1());
        }
        if (!tStudent.getImage2().isEmpty()){
            strings.add(tStudent.getImage2());
        }
        if (!tStudent.getImage3().isEmpty()){
            strings.add(tStudent.getImage3());
        }
        String result = String.join(";", strings);

        System.out.println("=======lateralSurface======>?"+lateralSurface);
        tStudent.setLateralSurface(lateralSurface);
        System.out.println("学员体测表的值"+lateralSurface);

//
//        String lateralSurface = tStudent.getImage1()+";"+tStudent.getImage2()+";"+tStudent.getImage3();
//
//        System.out.println("=======lateralSurface======>?"+lateralSurface);
        tStudent.setLateralSurface(result);
        System.out.println("学员体测表的值"+result);
        itStudentService.update(tStudent);
//        appUserClient.updateStudent(tStudent);
        return new ResultUtil(0,0,"编辑成功");
@@ -626,7 +646,9 @@

        updateTimeDto updateTimeDto =new updateTimeDto(date1,id);
        System.out.println("======updateTimeDto=====>"+updateTimeDto);
        courseStuddentClient.updateUseDate(updateTimeDto);
//        courseStuddentClient.updateUseDate(updateTimeDto);

        studentClient.update(updateTimeDto);


        CreateHistoryDto historyDto = new CreateHistoryDto();
@@ -682,9 +704,6 @@
        toClassDto.setId(id);

        courseStuddentClient.toClass(toClassDto);

//        Map<String,List<SelectDto>> map = new HashMap<>();
//        map.put("options",selectDtos);
        return new ResultUtil(0,0,"编辑成功",1,"");
    }

@@ -697,15 +716,15 @@

        List<SelectDto>  selectDtos =  appUserClient.giftSelect(giftSearchDto);
        // 只查询当前用户下 同时也报名了该课程的学员
        for (SelectDto selectDto : selectDtos) {
            // 获取课包id
            TCoursePackagePayment tCoursePackagePayment = coursePackagePaymentClient.queryCoursePackagePaymentById(giftSearchDto.getId());

            Integer coursePackageId = tCoursePackagePayment.getCoursePackageId();
            // 学员id 拿到学员id 判断当前学员是否报名了这门课程
            Long id = selectDto.getId();
            //
        }
//        for (SelectDto selectDto : selectDtos) {
//            // 获取课包id
//            TCoursePackagePayment tCoursePackagePayment = coursePackagePaymentClient.queryCoursePackagePaymentById(giftSearchDto.getId());
//
//            Integer coursePackageId = tCoursePackagePayment.getCoursePackageId();
//            // 学员id 拿到学员id 判断当前学员是否报名了这门课程
//            Long id = selectDto.getId();
//            //
//        }
        Map<String,List<SelectDto>> map = new HashMap<>();
        map.put("options",selectDtos);
//        Map<String,List<SelectDto>> map = new HashMap<>();