钉钉校园课程17

src/main/java/com/ipsa/learn/controller/CourseApplicationController.java

@@ -235,7 +235,7 @@ public class CourseApplicationController {
 
     @ApiOperation("代课申请")
     @PostMapping("/saveCourseApplication")
-    public ResponseModel<CourseApplication> saveCourseApplication(@RequestBody CurriculumDTO curriculumDTO){
+    public ResponseModel<String> saveCourseApplication(@RequestBody CurriculumDTO curriculumDTO){
         log.info("******代课申请curriculumDTO*****, :{}",curriculumDTO.toString());
         try {
             if (curriculumDTO != null){
@@ -245,7 +245,7 @@ public class CourseApplicationController {
                curriculumDTO.setClassTimeDto(localDateTime);
                 CourseApplication courseApplication = getCourseApplications(curriculumDTO);
                 courseApplicationService.save(courseApplication); //代課申請保存
-                return ResponseModel.success(courseApplication).code(ResultCode.SUCCESS);
+                return ResponseModel.success("代课申请保存成功").code(ResultCode.SUCCESS);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -270,7 +270,7 @@ public class CourseApplicationController {
         courseApplication.setApplicationName(curriculumDTO.getApplicationNameDto());//申请人
         courseApplication.setReplaceName(curriculumDTO.getReplaceNameDto());//代课人
         courseApplication.setCreateUser(curriculumDTO.getCreateUser());//创建人
-        courseApplication.setCreateTime(DateUtil.DateToLocalDateTime());//创建时间
+        //courseApplication.setCreateTime(DateUtil.DateToLocalDateTime());//创建时间
         courseApplication.setYn(ChooseStatus.NORMAL.getValue()); //正常
         courseApplication.setStatus(CheckStatus.DURING.getValue()); //待申核
         courseApplication.setReasons(curriculumDTO.getReasonsDto()); //申請原因

src/main/java/com/ipsa/learn/controller/CourseResultlistController.java

@@ -41,7 +41,7 @@ public class CourseResultlistController {
     @Autowired
     CourseResultsuploadService courseResultsuploadService;
 
-    @ApiOperation("家长列表查询")
+    @ApiOperation("家长查询孩子成绩列表")
     @PostMapping("/getParentsList")
     public ResponseModel<List<CourseSoreVo>> getParentsList(@RequestBody CourseResultsuploadVo courseResultsupload){
         try {

src/main/java/com/ipsa/learn/controller/ElectiveCourseController.java

@@ -50,9 +50,8 @@ public class ElectiveCourseController {
     public ResponseModel<String> save(@RequestBody ElectiveCourse electiveCourse){
         try {
             log.info("****electiveCourse****,:{}",electiveCourse.toString());
-
-            electiveCourse.setCreateTime(DateUtil.DateToLocalDateTime()); //创建选修排课的时间
             electiveCourse.setYn(ChooseStatus.NORMAL.getValue());
+            electiveCourse.setEnrollNumber(0);
             electiveCourseService.save(electiveCourse);
             return ResponseModel.success("添加选修排课列表成功").code(ResultCode.SUCCESS);
         } catch (Exception e) {

src/main/java/com/ipsa/learn/controller/ElectiveEnrollController.java

@@ -90,11 +90,15 @@ public class ElectiveEnrollController {
                     electiveEnroll.setStudentNumbe(electiveCours.getStudentNumbeDto());//学生学号  钉钉获取
                     electiveEnroll.setStudentName(electiveCours.getStudentNameDto());//学生名称   钉钉获取
                     electiveEnroll.setCreateUser(electiveCours.getCreateUser()); //创建人     钉钉获取
+                    electiveEnroll.setStudentId(electiveCours.getStudentId());  //学生UserId
                     //  electiveEnroll.setUpdateUser(); //修改人     钉钉获取
                     electiveEnroll.setYn(ChooseStatus.NORMAL.getValue());
                     electiveEnrollService.save(electiveEnroll);
                     Long electiveCourseId = electiveCours.getElectiveCourseId();
                     ElectiveCourse course = electiveCourseService.getById(electiveCourseId);
+                    if (null == course.getEnrollNumber()){
+                        course.setEnrollNumber(0);
+                    }
                     Integer enrollNumber = course.getEnrollNumber()+1;
                     log.info("******enrollNumber***** :{}",enrollNumber);
                     course.setEnrollNumber(enrollNumber);

src/main/java/com/ipsa/learn/service/impl/CourseApplicationServiceImpl.java

@@ -50,14 +50,14 @@ public class CourseApplicationServiceImpl extends ServiceImpl<CourseApplicationD
             //班级
             queryWrapper.eq(CourseApplication::getClassCode,scheduleDto.getClassCodeDto());
         }
-        if (StringUtils.isNotEmpty(scheduleDto.getApplicationNameDto())){
+        /*if (StringUtils.isNotEmpty(scheduleDto.getApplicationNameDto())){
             //申请人
             queryWrapper.eq(CourseApplication::getApplicationName,scheduleDto.getApplicationNameDto());
         }
         if (StringUtils.isNotEmpty(scheduleDto.getCurriculumNameDto())){
             //课程名称
             queryWrapper.like(CourseApplication::getCurriculumName,scheduleDto.getCurriculumNameDto());
-        }
+        }*/
         if (scheduleDto.getStartTimeDto() != null && scheduleDto.getLastTimeDto() != null){
             //时间范围
             queryWrapper.between(CourseApplication::getApplicationTime,scheduleDto.getStartTimeDto(),scheduleDto.getLastTimeDto());

src/main/java/com/ipsa/learn/util/ReadExcel.java

@@ -120,7 +120,7 @@ public class ReadExcel {
                 if (null != cell) {
                     if (c == 0) {
                             String s = String.valueOf(r);
-                            user.setClassPeriod(s);// 课节
+                            user.setClassPeriod("第"+s+"节");// 课节
                     }
                     if (c == 1) {
                         // 如果是纯数字,比如你写的是25,cell.getNumericCellValue()获得是25.0,通过截取字符串去掉.0获得25

src/main/resources/static/mapper/ElectiveCourseDao.xml

@@ -65,7 +65,7 @@
         <if test="studentId != null ">
             AND ol.student_id = #{studentId}
         </if>
-        WHERE el.yn = 1
+        WHERE el.yn = 1 AND ol.yn = 1
         <if test="schoolCodeDto != null ">
             AND el.school_code = #{schoolCodeDto}
         </if>