diff --git a/src/main/java/com/msdw/tms/api/ClassTeachingApi.java b/src/main/java/com/msdw/tms/api/ClassTeachingApi.java index 957321b..d0efeda 100644 --- a/src/main/java/com/msdw/tms/api/ClassTeachingApi.java +++ b/src/main/java/com/msdw/tms/api/ClassTeachingApi.java @@ -14,7 +14,7 @@ public interface ClassTeachingApi { @ApiOperation(value = "查询班级实验列表信息",notes = "查询班级实验列表信息") R queryTestRecord(Integer page, Integer size, Integer month, String startTime, String endTime, - String condition, Integer status, Integer isCode,Integer isUserId); + String condition, Integer status, Integer isCode); @ApiOperation(value = "查看成绩",notes = "查看成绩") R queryAchievement(); diff --git a/src/main/java/com/msdw/tms/controller/ClassTeachingController.java b/src/main/java/com/msdw/tms/controller/ClassTeachingController.java index 346154b..b562a13 100644 --- a/src/main/java/com/msdw/tms/controller/ClassTeachingController.java +++ b/src/main/java/com/msdw/tms/controller/ClassTeachingController.java @@ -33,7 +33,7 @@ public class ClassTeachingController implements ClassTeachingApi { @Override @GetMapping("userRecord") public R queryTestRecord(@RequestParam Integer page, @RequestParam Integer size, Integer month,@RequestParam String startTime,@RequestParam String endTime, - String condition, @RequestParam Integer status,@RequestParam Integer isCode,@RequestParam Integer isUserId){ + String condition, @RequestParam Integer status,@RequestParam Integer isCode){ ProjectRecordVo recordVo = new ProjectRecordVo(); if (isCode==0){ if (status!=0) {//不限定实验状态 @@ -52,7 +52,7 @@ public class ClassTeachingController implements ClassTeachingApi { recordVo.setEndTime(endTime); } } - recordVo.setIsCode(isCode).setUserId(isUserId); + recordVo.setIsCode(isCode); PageUtils page1 = classTeachingService.queryClassRecord(page,size,recordVo); return R.ok().put("page", page1); }else if (isCode==1){ diff --git a/src/main/resources/mapper/tms/ClassTeachingDao.xml b/src/main/resources/mapper/tms/ClassTeachingDao.xml index c36b5c4..7327f7b 100644 --- a/src/main/resources/mapper/tms/ClassTeachingDao.xml +++ b/src/main/resources/mapper/tms/ClassTeachingDao.xml @@ -21,11 +21,9 @@ WHERE `status` = #{cla.status} and is_code = #{cla.isCode} - and user_id = #{cla.userId} and ( project_name like concat('%',#{cla.condition},'%') or experimental_class_name like concat('%',#{cla.condition},'%') ) and stop_time between #{cla.endTime} and #{cla.startTime} and DATE_SUB(CURDATE(), INTERVAL #{cla.month} month ) <= date(stop_time) - \ No newline at end of file