From 64a00efd9e47970fd911bec0069ddb6a52bb4e3b Mon Sep 17 00:00:00 2001 From: whb <17803890193@163.com> Date: Wed, 9 Oct 2024 17:51:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=AE=8C=E6=88=90=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E6=95=B0=E5=AD=97=E5=8F=91=E8=A1=8C=E3=80=81=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E5=AE=89=E5=85=A8=E3=80=81=E6=95=B0=E6=8D=AE=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E6=B3=95=E3=80=81=E7=94=B5=E5=AD=90=E5=95=86=E5=8A=A1?= =?UTF-8?q?=E6=B3=95=E3=80=81=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E4=BF=9D?= =?UTF-8?q?=E6=8A=A4=E6=B3=95=E5=AE=9E=E8=AE=AD=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E8=AE=BE=E8=AE=A1=E5=8F=8A=E7=9B=B8=E5=85=B3=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=BC=80=E5=8F=91=EF=BC=8C=E5=BC=B9=E7=AA=97=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=92=8C=E9=87=8D=E6=96=B0=E5=AE=9E=E8=AE=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stu/StuExpermentTrainingController.java | 8 ++----- .../controller/stu/StuSignInfoController.java | 3 +-- .../controller/tch/TchSignInfoController.java | 6 +---- .../entity/dto/StuExpermentSubmitDTO.java | 12 +++++----- .../StuExpermentTrainingScoreMapper.java | 4 +++- .../mapper/StuTaskPracticeRecordMapper.java | 3 +++ .../mapper/StuWrongQuestionRankingMapper.java | 4 +++- ...acherOpenCourseStudentSigninLogMapper.java | 4 +++- ...rOpenCourseStudentSigninSettingMapper.java | 6 ++++- .../impl/StuExpermentTrainingServiceImpl.java | 23 ++++--------------- .../service/impl/StuSignInfoServiceImpl.java | 4 ---- ...herOpenCourseStudentSigninServiceImpl.java | 14 ----------- ...erOpenCourseStudentSigninSettingMapper.xml | 1 + 13 files changed, 32 insertions(+), 60 deletions(-) diff --git a/src/main/java/com/sztzjy/trade/controller/stu/StuExpermentTrainingController.java b/src/main/java/com/sztzjy/trade/controller/stu/StuExpermentTrainingController.java index d7790f9..f1d4ebb 100644 --- a/src/main/java/com/sztzjy/trade/controller/stu/StuExpermentTrainingController.java +++ b/src/main/java/com/sztzjy/trade/controller/stu/StuExpermentTrainingController.java @@ -33,11 +33,9 @@ public class StuExpermentTrainingController { @ApiOperation("实训任务提交") public ResultEntity expermentSubmit(@RequestBody StuExpermentSubmitDTO stuExpermentSubmitDTO) { - //得分表为空，表示没提交 以此来判断状态（默认为空） return service.expermentSubmit(stuExpermentSubmitDTO); - } @@ -55,8 +53,7 @@ public class StuExpermentTrainingController { @AnonymousAccess @GetMapping("/academicRecordInfo") @ApiOperation("错题排名详情") - public ResultEntity academicRecordInfo(String schoolId, String module, Integer page - , Integer size) { + public ResultEntity academicRecordInfo(String schoolId, String module, Integer page, Integer size) { return service.academicRecordInfo(schoolId, module, page, size); @@ -67,8 +64,7 @@ public class StuExpermentTrainingController { @AnonymousAccess @GetMapping("/trainingTaskDetails") @ApiOperation("得分排名详情") - public ResultEntity trainingTaskDetails(String userId, String module, Integer page - , Integer size) { + public ResultEntity trainingTaskDetails(String userId, String module, Integer page, Integer size) { return service.trainingTaskDetails(userId, module, page, size); diff --git a/src/main/java/com/sztzjy/trade/controller/stu/StuSignInfoController.java b/src/main/java/com/sztzjy/trade/controller/stu/StuSignInfoController.java index 8416400..e25a52a 100644 --- a/src/main/java/com/sztzjy/trade/controller/stu/StuSignInfoController.java +++ b/src/main/java/com/sztzjy/trade/controller/stu/StuSignInfoController.java @@ -47,8 +47,7 @@ public class StuSignInfoController { @PostMapping("sign") @ApiOperation("用户签到操作") @AnonymousAccess - public ResultEntity sign(HttpServletRequest request - , @RequestBody @Valid StuSignDTO stuSignDTO ){ + public ResultEntity sign(HttpServletRequest request, @RequestBody @Valid StuSignDTO stuSignDTO ){ return service.sign(stuSignDTO,request); diff --git a/src/main/java/com/sztzjy/trade/controller/tch/TchSignInfoController.java b/src/main/java/com/sztzjy/trade/controller/tch/TchSignInfoController.java index 9c88ae5..7d2cceb 100644 --- a/src/main/java/com/sztzjy/trade/controller/tch/TchSignInfoController.java +++ b/src/main/java/com/sztzjy/trade/controller/tch/TchSignInfoController.java @@ -148,7 +148,6 @@ public class TchSignInfoController { - @ApiOperation("导出") @GetMapping("/importListInfo") @AnonymousAccess @@ -167,13 +166,10 @@ public class TchSignInfoController { ) { //"yyyy-MM-dd HH:mm:ss" - - teacherOpenCourseStudentSigninService.importListInfo(response,studentId, type, classId, page, size, signTime, signInfo, missInfo, signId, classIds); - + teacherOpenCourseStudentSigninService.importListInfo(response, studentId, type, classId, page, size, signTime, signInfo, missInfo, signId, classIds); } - } diff --git a/src/main/java/com/sztzjy/trade/entity/dto/StuExpermentSubmitDTO.java b/src/main/java/com/sztzjy/trade/entity/dto/StuExpermentSubmitDTO.java index ed10242..3b069f8 100644 --- a/src/main/java/com/sztzjy/trade/entity/dto/StuExpermentSubmitDTO.java +++ b/src/main/java/com/sztzjy/trade/entity/dto/StuExpermentSubmitDTO.java @@ -21,22 +21,22 @@ public class StuExpermentSubmitDTO { @NotBlank private String userId; - @ApiModelProperty("学号") + @ApiModelProperty(notes ="学号") private String studentId; - @ApiModelProperty("姓名") + @ApiModelProperty(notes ="姓名") private String name; - @ApiModelProperty("班级名称") + @ApiModelProperty(notes ="班级名称") private String className; - @ApiModelProperty("班级ID") + @ApiModelProperty(notes ="班级ID") private String classId; - @ApiModelProperty("学校ID") + @ApiModelProperty(notes ="学校ID") private String schoolId; - @ApiModelProperty("模块") + @ApiModelProperty(notes ="模块") private String module; diff --git a/src/main/java/com/sztzjy/trade/mapper/StuExpermentTrainingScoreMapper.java b/src/main/java/com/sztzjy/trade/mapper/StuExpermentTrainingScoreMapper.java index 59f73f1..b94ae2c 100644 --- a/src/main/java/com/sztzjy/trade/mapper/StuExpermentTrainingScoreMapper.java +++ b/src/main/java/com/sztzjy/trade/mapper/StuExpermentTrainingScoreMapper.java @@ -3,8 +3,10 @@ package com.sztzjy.trade.mapper; import com.sztzjy.trade.entity.StuExpermentTrainingScore; import com.sztzjy.trade.entity.StuExpermentTrainingScoreExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface StuExpermentTrainingScoreMapper { long countByExample(StuExpermentTrainingScoreExample example); diff --git a/src/main/java/com/sztzjy/trade/mapper/StuTaskPracticeRecordMapper.java b/src/main/java/com/sztzjy/trade/mapper/StuTaskPracticeRecordMapper.java index 8f919c0..5686b13 100644 --- a/src/main/java/com/sztzjy/trade/mapper/StuTaskPracticeRecordMapper.java +++ b/src/main/java/com/sztzjy/trade/mapper/StuTaskPracticeRecordMapper.java @@ -3,8 +3,11 @@ package com.sztzjy.trade.mapper; import com.sztzjy.trade.entity.StuTaskPracticeRecord; import com.sztzjy.trade.entity.StuTaskPracticeRecordExample; import java.util.List; + +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +@Mapper public interface StuTaskPracticeRecordMapper { long countByExample(StuTaskPracticeRecordExample example); diff --git a/src/main/java/com/sztzjy/trade/mapper/StuWrongQuestionRankingMapper.java b/src/main/java/com/sztzjy/trade/mapper/StuWrongQuestionRankingMapper.java index 7fe2ce2..d8f1ee1 100644 --- a/src/main/java/com/sztzjy/trade/mapper/StuWrongQuestionRankingMapper.java +++ b/src/main/java/com/sztzjy/trade/mapper/StuWrongQuestionRankingMapper.java @@ -3,8 +3,10 @@ package com.sztzjy.trade.mapper; import com.sztzjy.trade.entity.StuWrongQuestionRanking; import com.sztzjy.trade.entity.StuWrongQuestionRankingExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface StuWrongQuestionRankingMapper { long countByExample(StuWrongQuestionRankingExample example); diff --git a/src/main/java/com/sztzjy/trade/mapper/TeacherOpenCourseStudentSigninLogMapper.java b/src/main/java/com/sztzjy/trade/mapper/TeacherOpenCourseStudentSigninLogMapper.java index 89f78e4..36b301a 100644 --- a/src/main/java/com/sztzjy/trade/mapper/TeacherOpenCourseStudentSigninLogMapper.java +++ b/src/main/java/com/sztzjy/trade/mapper/TeacherOpenCourseStudentSigninLogMapper.java @@ -3,8 +3,10 @@ package com.sztzjy.trade.mapper; import com.sztzjy.trade.entity.TeacherOpenCourseStudentSigninLog; import com.sztzjy.trade.entity.TeacherOpenCourseStudentSigninLogExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface TeacherOpenCourseStudentSigninLogMapper { long countByExample(TeacherOpenCourseStudentSigninLogExample example); diff --git a/src/main/java/com/sztzjy/trade/mapper/TeacherOpenCourseStudentSigninSettingMapper.java b/src/main/java/com/sztzjy/trade/mapper/TeacherOpenCourseStudentSigninSettingMapper.java index cdeb26f..02865bd 100644 --- a/src/main/java/com/sztzjy/trade/mapper/TeacherOpenCourseStudentSigninSettingMapper.java +++ b/src/main/java/com/sztzjy/trade/mapper/TeacherOpenCourseStudentSigninSettingMapper.java @@ -3,8 +3,10 @@ package com.sztzjy.trade.mapper; import com.sztzjy.trade.entity.TeacherOpenCourseStudentSigninSetting; import com.sztzjy.trade.entity.TeacherOpenCourseStudentSigninSettingExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface TeacherOpenCourseStudentSigninSettingMapper { long countByExample(TeacherOpenCourseStudentSigninSettingExample example); @@ -16,6 +18,7 @@ public interface TeacherOpenCourseStudentSigninSettingMapper { int insertSelective(TeacherOpenCourseStudentSigninSetting record); + List selectByExample(TeacherOpenCourseStudentSigninSettingExample example); TeacherOpenCourseStudentSigninSetting selectByPrimaryKey(Long teacherOpenCourseStudentSigninSettingId); @@ -27,4 +30,5 @@ public interface TeacherOpenCourseStudentSigninSettingMapper { int updateByPrimaryKeySelective(TeacherOpenCourseStudentSigninSetting record); int updateByPrimaryKey(TeacherOpenCourseStudentSigninSetting record); + } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/trade/service/impl/StuExpermentTrainingServiceImpl.java b/src/main/java/com/sztzjy/trade/service/impl/StuExpermentTrainingServiceImpl.java index f1cb84f..4c7bae8 100644 --- a/src/main/java/com/sztzjy/trade/service/impl/StuExpermentTrainingServiceImpl.java +++ b/src/main/java/com/sztzjy/trade/service/impl/StuExpermentTrainingServiceImpl.java @@ -141,10 +141,8 @@ public class StuExpermentTrainingServiceImpl implements StuExpermentTrainingServ stuTaskPracticeRecordList.get(0).setSubState(1); stuTaskPracticeRecordMapper.updateByPrimaryKeyWithBLOBs(stuTaskPracticeRecordList.get(0)); - return new ResultEntity<>(HttpStatus.OK, "提交成功"); - } else { //不保存做题记录和平均分 return new ResultEntity<>(HttpStatus.OK, "提交成功！", "超出三次提交计分,不计入总分"); @@ -197,8 +195,6 @@ public class StuExpermentTrainingServiceImpl implements StuExpermentTrainingServ } } - - } /** @@ -209,9 +205,9 @@ public class StuExpermentTrainingServiceImpl implements StuExpermentTrainingServ * @return */ @Override - public ResultEntity academicRecordInfo(String schoolId, String module,Integer page,Integer size) { + public ResultEntity academicRecordInfo(String schoolId, String module, Integer page, Integer size) { - PageHelper.startPage(page,size); + PageHelper.startPage(page, size); StuWrongQuestionRankingExample example = new StuWrongQuestionRankingExample(); example.setOrderByClause("asc task_number"); @@ -236,9 +232,9 @@ public class StuExpermentTrainingServiceImpl implements StuExpermentTrainingServ */ @Override - public ResultEntity trainingTaskDetails(String userId, String module,Integer page,Integer size) { + public ResultEntity trainingTaskDetails(String userId, String module, Integer page, Integer size) { - PageHelper.startPage(page,size); + PageHelper.startPage(page, size); StuExpermentTrainingScoreExample expermentTrainingScoreExample = new StuExpermentTrainingScoreExample(); expermentTrainingScoreExample.createCriteria() .andUserIdEqualTo(userId).andModuleEqualTo(module); @@ -274,21 +270,16 @@ public class StuExpermentTrainingServiceImpl implements StuExpermentTrainingServ wrongQuestionRanking.setModule(module); stuWrongQuestionRankingMapper.insertSelective(wrongQuestionRanking); } - } else { for (int i = 0; i < stuWrongQuestionRankingList.size(); i++) { - for (int j = 0; j < taskList.size(); j++) { - if (stuWrongQuestionRankingList.get(i).getTaskNumber().equals(taskList.get(j).getTaskNumber()) && stuWrongQuestionRankingList.get(i).getTaskName().equals(taskList.get(j).getTaskName())) { - //答错次数 //当前任务序号总答错次数 Integer numberOfIncorrectAnswers = stuWrongQuestionRankingList.get(i).getNumberOfIncorrectAnswers(); //当前任务序号总错误次数 Integer errorCount = taskList.get(j).getErrorCount(); - stuWrongQuestionRankingList.get(i).setNumberOfIncorrectAnswers(numberOfIncorrectAnswers + errorCount); //用户第一次 添加人数 为0不添加人数 if (state == 1) { @@ -297,16 +288,10 @@ public class StuExpermentTrainingServiceImpl implements StuExpermentTrainingServ stuWrongQuestionRankingList.get(i).setNumberErrotOfPeople(studentAll + 1); } stuWrongQuestionRankingMapper.updateByPrimaryKeySelective(stuWrongQuestionRankingList.get(i)); - } - } - } - - } } - } diff --git a/src/main/java/com/sztzjy/trade/service/impl/StuSignInfoServiceImpl.java b/src/main/java/com/sztzjy/trade/service/impl/StuSignInfoServiceImpl.java index be03798..3d5ff37 100644 --- a/src/main/java/com/sztzjy/trade/service/impl/StuSignInfoServiceImpl.java +++ b/src/main/java/com/sztzjy/trade/service/impl/StuSignInfoServiceImpl.java @@ -144,7 +144,6 @@ public class StuSignInfoServiceImpl implements StuSignInfoService { return new ResultEntity<>(HttpStatus.BAD_REQUEST, "您已成功签到!"); } - TeacherOpenCourseStudentSigninSetting openCourseStudentSigninSetting = teacherOpenCourseStudentSigninSettingMapper.selectByPrimaryKey(stuSignDTO.getTeacherOpenCourseStudentSigninSettingId()); String settingValue = openCourseStudentSigninSetting.getTeacherOpenCourseStudentSigninSettingValue(); @@ -170,7 +169,6 @@ public class StuSignInfoServiceImpl implements StuSignInfoService { //签到 signByStudent(null, openCourseStudentSigninSetting, stuSignDTO); - } //根据签到类型操作 ip @@ -219,12 +217,10 @@ public class StuSignInfoServiceImpl implements StuSignInfoService { studentSigninLog.setTeacherOpenCourseStudentSigninLogType(Constant.CODE); - } teacherOpenCourseStudentSigninLogMapper.insertSelective(studentSigninLog); - } diff --git a/src/main/java/com/sztzjy/trade/service/impl/TeacherOpenCourseStudentSigninServiceImpl.java b/src/main/java/com/sztzjy/trade/service/impl/TeacherOpenCourseStudentSigninServiceImpl.java index b77e2b2..1f3da09 100644 --- a/src/main/java/com/sztzjy/trade/service/impl/TeacherOpenCourseStudentSigninServiceImpl.java +++ b/src/main/java/com/sztzjy/trade/service/impl/TeacherOpenCourseStudentSigninServiceImpl.java @@ -538,20 +538,15 @@ public class TeacherOpenCourseStudentSigninServiceImpl implements TeacherOpenCou teacherOpenCourseStudentSigninLogList.add(teacherOpenCourseStudentSigninLog); } } - PageInfo courseStudentSigninLogPageInfo = new PageInfo<>(teacherOpenCourseStudentSigninLogList); return new ResultEntity<>(HttpStatus.OK, courseStudentSigninLogPageInfo); - } - } - } - List teacherOpenCourseStudentSigninLogList = teacherOpenCourseStudentSigninLogMapper.selectByExample(openCourseStudentSigninLogExample); @@ -689,22 +684,15 @@ public class TeacherOpenCourseStudentSigninServiceImpl implements TeacherOpenCou stuImportExcelDTO.setClassName(stuUser.getClassName()); stuImportExcelDTO.setTeacherOpenCourseStudentSigninLogAddTime(teacherOpenCourseStudentSigninLogList.get(0).getTeacherOpenCourseStudentSigninLogAddTime()); stuImportExcelDTO.setTeacherOpenCourseStudentSigninLogType(teacherOpenCourseStudentSigninLogList.get(0).getTeacherOpenCourseStudentSigninLogType() == "manual" ? "手动签到" : teacherOpenCourseStudentSigninLogList.get(0).getTeacherOpenCourseStudentSigninLogType()); - - importExcelDTOList.add(stuImportExcelDTO); } } - return importExcelDTOList; } - } - } - List teacherOpenCourseStudentSigninLogList = teacherOpenCourseStudentSigninLogMapper.selectByExample(openCourseStudentSigninLogExample); - for (StuUser stuUser : stuUserList) { StuImportExcelDTO stuImportExcelDTO = new StuImportExcelDTO(); @@ -718,14 +706,12 @@ public class TeacherOpenCourseStudentSigninServiceImpl implements TeacherOpenCou stuImportExcelDTO.setTeacherOpenCourseStudentSigninLogType(studentSigninLog.getTeacherOpenCourseStudentSigninLogType() == "manual" ? "手动签到" : studentSigninLog.getTeacherOpenCourseStudentSigninLogType()); stuImportExcelDTO.setTeacherOpenCourseStudentSigninLogRemark(studentSigninLog.getTeacherOpenCourseStudentSigninLogRemark()); importExcelDTOList.add(stuImportExcelDTO); - } } } return importExcelDTOList; - } diff --git a/src/main/resources/mappers/TeacherOpenCourseStudentSigninSettingMapper.xml b/src/main/resources/mappers/TeacherOpenCourseStudentSigninSettingMapper.xml index e2fe182..67e1753 100644 --- a/src/main/resources/mappers/TeacherOpenCourseStudentSigninSettingMapper.xml +++ b/src/main/resources/mappers/TeacherOpenCourseStudentSigninSettingMapper.xml @@ -144,6 +144,7 @@ school_class_ids, + teacher_open_course_student_signin_setting_type,