From b904adc2f2616fd40346b0dedaf450fd3ff0b6ff Mon Sep 17 00:00:00 2001 From: pd <2776455882@qq.com> Date: Mon, 27 Jul 2020 10:41:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A5=E8=80=83=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E4=B8=8A=E4=BC=A0=E6=97=B6=E9=97=B4=EF=BC=8C?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E8=80=83=E6=A0=B8=E7=AE=A1=E7=90=86=E7=9A=84?= =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E7=8F=AD=E7=BA=A7=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AssesmentController.java | 28 +- .../controller/MakeuplistController.java | 6 +- .../yipin/liuwanr/mapper/AssesmentMapper.java | 613 +++++++++--------- .../liuwanr/service/AssesmentService.java | 11 +- .../liuwanr/service/MakeuplistService.java | 19 +- 5 files changed, 349 insertions(+), 328 deletions(-) diff --git a/src/main/java/com/yipin/liuwanr/controller/AssesmentController.java b/src/main/java/com/yipin/liuwanr/controller/AssesmentController.java index 9ba46c6..043bd45 100644 --- a/src/main/java/com/yipin/liuwanr/controller/AssesmentController.java +++ b/src/main/java/com/yipin/liuwanr/controller/AssesmentController.java @@ -242,21 +242,21 @@ public class AssesmentController { } return resp; } - - + + /** * 查询实验班级一级栏目 - * @param schoolId + * @param staffId * @return */ @GetMapping("/getExperimentalClass") - Response getExperimentalClass(@RequestParam Integer schoolId) { + Response getExperimentalClass(@RequestParam Integer staffId) { Response resp = new Response(); - if(StringUtils.isEmpty(schoolId)){ + if(StringUtils.isEmpty(staffId)){ resp.setStatus(300); - resp.setErrmessage("学校为空！"); + resp.setErrmessage("教师信息为空"); }else{ - HashMap ret = service.queryCretionTime(schoolId); + HashMap ret = service.queryCretionTime(staffId); int status = (int) ret.get("retcode"); if (200 == status) { resp.setStatus(status); @@ -268,24 +268,24 @@ public class AssesmentController { } return resp; } - - + + /** - * 二级查询实验班级名称，以及班级一下的学生 + * 查询实验班级名称，以及班级一下的学生 * @param creationTime * @return */ @GetMapping("/getCreationTime") - Response getCreationTime(@RequestParam String creationTime,@RequestParam Integer schoolId) { + Response getCreationTime(@RequestParam String creationTime,@RequestParam Integer staffId) { Response resp = new Response(); - if(StringUtils.isEmpty(schoolId)){ + if(StringUtils.isEmpty(staffId)){ resp.setStatus(300); - resp.setErrmessage("学校为空！"); + resp.setErrmessage("教师信息为空"); }else if(StringUtils.isEmpty(creationTime)){ resp.setStatus(300); resp.setErrmessage("实验班级创建时间信息为空"); }else { - HashMap ret = service.queryCretionTime(creationTime,schoolId); + HashMap ret = service.queryCretionTime(creationTime,staffId); int status = (int) ret.get("retcode"); if (200 == status) { resp.setStatus(status); diff --git a/src/main/java/com/yipin/liuwanr/controller/MakeuplistController.java b/src/main/java/com/yipin/liuwanr/controller/MakeuplistController.java index 50fd3f8..41f6b7d 100644 --- a/src/main/java/com/yipin/liuwanr/controller/MakeuplistController.java +++ b/src/main/java/com/yipin/liuwanr/controller/MakeuplistController.java @@ -69,7 +69,8 @@ public class MakeuplistController { * @return */ @GetMapping("/queryGetByClassName") - Response queryGetByClassName(@RequestParam Integer staffId,@RequestParam String uploadTime,@RequestParam Integer uploadType,@RequestParam Integer schoolId) { + Response queryGetByClassName(@RequestParam Integer staffId,@RequestParam long uploadTime, + @RequestParam Integer uploadType,@RequestParam Integer schoolId) { Response resp = new Response(); if(StringUtils.isEmpty(staffId)) { resp.setStatus(300); @@ -122,7 +123,8 @@ public class MakeuplistController { } @GetMapping("/getStudent") - Response getStudent(@RequestParam Integer staffId,@RequestParam String uploadTime,@RequestParam Integer uploadType,@RequestParam Integer schoolId){ + Response getStudent(@RequestParam Integer staffId,@RequestParam long uploadTime,@RequestParam Integer uploadType, + @RequestParam Integer schoolId){ Response resp = new Response(); if(StringUtils.isEmpty(staffId)) { resp.setStatus(300); diff --git a/src/main/java/com/yipin/liuwanr/mapper/AssesmentMapper.java b/src/main/java/com/yipin/liuwanr/mapper/AssesmentMapper.java index 6dd057b..268d099 100644 --- a/src/main/java/com/yipin/liuwanr/mapper/AssesmentMapper.java +++ b/src/main/java/com/yipin/liuwanr/mapper/AssesmentMapper.java @@ -25,303 +25,320 @@ import com.yipin.liuwanr.entity.Student; * */ import com.yipin.liuwanr.entity.SutdentClass; + public interface AssesmentMapper { - - - /** - * 查询项目权限为考核的项目 - * @return - */ - @Select("select projectId,projectName,projectPermissions,founder,creationTime from hr_project_management " + - " where isdel=0 and projectPermissions=1 AND systemId in (select systemId FROM hr_course_tc where courseId=#{courseId} GROUP BY systemId)") - List queryGetByAssesmentProject(Integer courseId); - - - /** - * 考核列表信息查询 - * @param assesment - * @return - */ - @Select({ " "}) - List getByCondition(Assesment assesment); - - - - /** - * 查询选中的学生，有哪些正在参与考核 - * @param studentIds - * @return - */ - @Select({""}) - List queryStudentisAssess(@Param("studentIds") List studentIds); - - - /** - * 创建考核 - * @param assesment - */ - @Insert("insert into assessment (assesmentName,releaseType,creationTime,endTime,timesum,experimentId,classId,assesmentState,assessmentSize,experimentalClassId,staffId,courseId,assessmentNumber)" - + " values (#{assesmentName},#{releaseType},#{creationTime},#{endTime},#{timesum},#{experimentId},#{classId},#{assesmentState},#{assessmentSize},#{experimentalClassId},#{staffId},#{courseId},#{assessmentNumber})") - @Options(useGeneratedKeys = true,keyColumn ="id",keyProperty = "id") - void insertAssesment(Assesment assesment); - - - /** - * 修改考核 - * @param assesment - */ - @Update("update assessment set assesmentName=#{assesmentName},releaseType=#{releaseType},creationTime=#{creationTime},endTime=#{endTime},timesum=#{timesum},assessmentSize=#{assessmentSize},assessmentNumber=#{assessmentNumber}" - + "experimentId=#{experimentId},assesmentState=#{assesmentState},classId=#{classId},experimentalClassId=#{experimentalClassId} where id=#{id}") - void updateAssesment(Assesment assesment); - - - /** - * 添加考核记录 - */ - @Insert({ "" }) - void insertRecore(@Param("studentIds")List studentIds,@Param("projectId")Integer projectId,@Param("courseId")Integer courseId,@Param("assesmentId")Integer assesmentId); - - - /** - * 根据考核id查询数据 - * @param id - * @return - */ - @Select("select id,experimentId,creationTime,endTime,assesmentName,releaseType,timesum,experimentalClassId,classId from assessment where id=#{id}") - Assesment queryGetById(Integer id); - - @Select("select assessmentNumber from assessment where id=#{assesmentId}") - Integer getAssesmentNumber(Integer assesmentId); - - /** - * 查询行政班级id - * @param studentIds - * @return - */ - @Select({""}) - List queryClassId(@Param("studentIds")List studentIds); - - - /** - * 创建考核时选中的学生 - * @param assesmentId - * @return - */ - @Select("SELECT stu.studentId as studentId,studentName as studentName FROM record re,student stu WHERE re.studentId=stu.studentId AND re.assesmentId=#{assesmentId}") - List queryStudent(Integer assesmentId); - - - /** - * 删除多余的记录信息 - * @param assesmentId - * @param students - */ - @Delete({""}) - void deleteRecord(@Param("assesmentId")Integer assesmentId,@Param("students")List students); - - - /** - * 正在参与考核的学生 - * @return - */ - @Select("select studentId from record re left join assessment ass on re.assesmentId=ass.id where ass.assesmentState=1 and re.assesmentId is not null") - List getStudentisAssess(); - - - /** - * 修改考核状态 - */ - @Update({""}) - void updateAssesmentState(Assesment assesment); - - - - /** - * 查询实验班级一级标题：创建时间 - * @param schoolId - * @return - */ - @Select("select creationTime from experimental_class_ning WHERE isdel=0 and schoolId = #{schoolId} GROUP BY creationTime ORDER BY creationTime desc") - List queryCreationTime(Integer schoolId); - - - /** - * 查询实验班级信息,及班级下的学生 - * @param creationTime - * @return - */ - @Select("select experimentalClassId,experimentalClassName from experimental_class_ning where isdel=0 and creationTime=#{creationTime} and schoolId = #{schoolId})") - @Results({ - @Result(id = true,column = "experimentalClassId",property = "experimentalClassId"), - @Result(column ="experimentalClassName",property = "experimentalClassName" ), - @Result(column ="experimentalClassId",property = "students",many = @Many(select = "com.yipin.liuwanr.mapper.StudentMapper.queryStudent") ) - }) - List queryExperimentalClass(@Param("creationTime") String creationTime,@Param("schoolId") Integer schoolId); - - - - /** - * 考核名称、创建时间、结束时间、教师名称、考核人数、实到人数 - * @param assesmentId - * @return - */ - @Select("SELECT ass.assesmentName as assesmentName ,ass.creationTime as creationTime,ass.endTime as endTime,ass.assessmentSize as assessmentSize,count(re.score) as actualNumber,st.staffName as staffName " - + " FROM (assessment ass left join staff st on ass.staffId=st.staffId) left join record re on ass.id=re.assesmentId WHERE ass.id=#{assesmentId} and re.score is not null") - Assesment queryAssesmentId(Integer assesmentId); - - - /** - * 实验班级 - * @param assesmentId - * @return - */ - @Select("SELECT ex.experimentalClassId as experimentalClassId,ex.experimentalClassName as experimentalClassName from assessment ass left join" - + " experimental_class_ning ex on ex.experimentalClassId=ass.experimentalClassId where ass.id=#{assesmentId}") - ExperimentalClass queryExperimental(Integer assesmentId); - - - /** - * 行政班级 - * @param assesmentId - * @return - */ - @Select("SELECT c.classId as classId,c.className as className from assessment ass left join class c on FIND_IN_SET(c.classId,ass.classId) where ass.id=#{assesmentId}") - List queryClass(Integer assesmentId); - - - /** - * 查询成绩(升序) - * @param assesmentId - * @param experimentalClassId - * @param classId - * @return - */ - @Select({""}) - List queryScore(Integer assesmentId,@Param("experimentalClassId")Integer experimentalClassId,@Param("classId") List classId); - - - /** - * 分组查询分数和对应人数 - * @param assesmentId - * @param experimentalClassId - * @param classId - * @return - */ - @Select({""}) - List queryScore2(@Param("assesmentId")Integer assesmentId,@Param("experimentalClassId")Integer experimentalClassId, - @Param("classId") List classId); - - - /** - * 统计某个班的总错误量 - * @param assesmentId - * @param experimentalClassId - * @param classId - * @return - */ - @Select({""}) - Integer queryRight(@Param("assesmentId")Integer assesmentId,@Param("experimentalClassId")Integer experimentalClassId, - @Param("classId") List classId); - - - /** - * 统计该项目的判分点数量 - * (select experimentId from assessment where id=#{assesmentId}) - * @return - */ - @Select("select count(judgmentPointsId) from hr_judgment_points where FIND_IN_SET(#{projectId},projectId)") - Integer queryPointNumber(Integer projectId); - - - /** - * 错误分布 - * @param assesmentId - * @param experimentalClassId - * @param classId - * @return - */ - @Select({""}) - List queryError(@Param("assesmentId")Integer assesmentId,@Param("experimentalClassId")Integer experimentalClassId, - @Param("classId") List classId); - - - @Select({""}) - List> queryScore3(@Param("assesmentId")Integer assesmentId,@Param("experimentalClassId")Integer experimentalClassId, - @Param("classId") List classId); - - - //开始考核 - @Select("select id,assesmentName,timesum from assessment where courseId=#{courseId} and releaseType=0 and assesmentState=0") - List releaseAssesment(Integer courseId); + + + /** + * 查询项目权限为考核的项目 + * + * @return + */ + @Select("select projectId,projectName,projectPermissions,founder,creationTime from hr_project_management " + + " where isdel=0 and projectPermissions=1 AND systemId in (select systemId FROM hr_course_tc where courseId=#{courseId} GROUP BY systemId)") + List queryGetByAssesmentProject(Integer courseId); + + + /** + * 考核列表信息查询 + * + * @param assesment + * @return + */ + @Select({" "}) + List getByCondition(Assesment assesment); + + + /** + * 查询选中的学生，有哪些正在参与考核 + * + * @param studentIds + * @return + */ + @Select({""}) + List queryStudentisAssess(@Param("studentIds") List studentIds); + + + /** + * 创建考核 + * + * @param assesment + */ + @Insert("insert into assessment (assesmentName,releaseType,creationTime,endTime,timesum,experimentId,classId,assesmentState,assessmentSize,experimentalClassId,staffId,courseId,assessmentNumber)" + + " values (#{assesmentName},#{releaseType},#{creationTime},#{endTime},#{timesum},#{experimentId},#{classId},#{assesmentState},#{assessmentSize},#{experimentalClassId},#{staffId},#{courseId},#{assessmentNumber})") + @Options(useGeneratedKeys = true, keyColumn = "id", keyProperty = "id") + void insertAssesment(Assesment assesment); + + + /** + * 修改考核 + * + * @param assesment + */ + @Update("update assessment set assesmentName=#{assesmentName},releaseType=#{releaseType},creationTime=#{creationTime},endTime=#{endTime},timesum=#{timesum},assessmentSize=#{assessmentSize},assessmentNumber=#{assessmentNumber}" + + "experimentId=#{experimentId},assesmentState=#{assesmentState},classId=#{classId},experimentalClassId=#{experimentalClassId} where id=#{id}") + void updateAssesment(Assesment assesment); + + + /** + * 添加考核记录 + */ + @Insert({""}) + void insertRecore(@Param("studentIds") List studentIds, @Param("projectId") Integer projectId, @Param("courseId") Integer courseId, @Param("assesmentId") Integer assesmentId); + + + /** + * 根据考核id查询数据 + * + * @param id + * @return + */ + @Select("select id,experimentId,creationTime,endTime,assesmentName,releaseType,timesum,experimentalClassId,classId from assessment where id=#{id}") + Assesment queryGetById(Integer id); + + @Select("select assessmentNumber from assessment where id=#{assesmentId}") + Integer getAssesmentNumber(Integer assesmentId); + + /** + * 查询行政班级id + * + * @param studentIds + * @return + */ + @Select({""}) + List queryClassId(@Param("studentIds") List studentIds); + + + /** + * 创建考核时选中的学生 + * + * @param assesmentId + * @return + */ + @Select("SELECT stu.studentId as studentId,studentName as studentName FROM record re,student stu WHERE re.studentId=stu.studentId AND re.assesmentId=#{assesmentId}") + List queryStudent(Integer assesmentId); + + + /** + * 删除多余的记录信息 + * + * @param assesmentId + * @param students + */ + @Delete({""}) + void deleteRecord(@Param("assesmentId") Integer assesmentId, @Param("students") List students); + + + /** + * 正在参与考核的学生 + * + * @return + */ + @Select("select studentId from record re left join assessment ass on re.assesmentId=ass.id where ass.assesmentState=1 and re.assesmentId is not null") + List getStudentisAssess(); + + + /** + * 修改考核状态 + */ + @Update({""}) + void updateAssesmentState(Assesment assesment); + + + /** + * 查询实验班级一级标题：创建时间 + * + * @param staffId + * @return + */ + @Select("select creationTime from experimental_class_ning WHERE isdel=0 and founder=(select staffName from staff where staffId=#{staffId}) GROUP BY creationTime ORDER BY creationTime desc") + List queryCreationTime(Integer staffId); + + + /** + * 查询实验班级信息,及班级下的学生 + * + * @param creationTime + * @return + */ + @Select("select experimentalClassId,experimentalClassName from experimental_class_ning where isdel=0 and creationTime=#{creationTime} and founder=(select staffName from staff where staffId=#{staffId})") + @Results({ + @Result(id = true, column = "experimentalClassId", property = "experimentalClassId"), + @Result(column = "experimentalClassName", property = "experimentalClassName"), + @Result(column = "experimentalClassId", property = "students", many = @Many(select = "com.yipin.liuwanr.mapper.StudentMapper.queryStudent")) + }) + List queryExperimentalClass(@Param("creationTime") String creationTime, @Param("staffId") Integer staffId); + + /** + * 考核名称、创建时间、结束时间、教师名称、考核人数、实到人数 + * + * @param assesmentId + * @return + */ + @Select("SELECT ass.assesmentName as assesmentName ,ass.creationTime as creationTime,ass.endTime as endTime,ass.assessmentSize as assessmentSize,count(re.score) as actualNumber,st.staffName as staffName " + + " FROM (assessment ass left join staff st on ass.staffId=st.staffId) left join record re on ass.id=re.assesmentId WHERE ass.id=#{assesmentId} and re.score is not null") + Assesment queryAssesmentId(Integer assesmentId); + + + /** + * 实验班级 + * + * @param assesmentId + * @return + */ + @Select("SELECT ex.experimentalClassId as experimentalClassId,ex.experimentalClassName as experimentalClassName from assessment ass left join" + + " experimental_class_ning ex on ex.experimentalClassId=ass.experimentalClassId where ass.id=#{assesmentId}") + ExperimentalClass queryExperimental(Integer assesmentId); + + + /** + * 行政班级 + * + * @param assesmentId + * @return + */ + @Select("SELECT c.classId as classId,c.className as className from assessment ass left join class c on FIND_IN_SET(c.classId,ass.classId) where ass.id=#{assesmentId}") + List queryClass(Integer assesmentId); + + + /** + * 查询成绩(升序) + * + * @param assesmentId + * @param experimentalClassId + * @param classId + * @return + */ + @Select({""}) + List queryScore(Integer assesmentId, @Param("experimentalClassId") Integer experimentalClassId, @Param("classId") List classId); + + + /** + * 分组查询分数和对应人数 + * + * @param assesmentId + * @param experimentalClassId + * @param classId + * @return + */ + @Select({""}) + List queryScore2(@Param("assesmentId") Integer assesmentId, @Param("experimentalClassId") Integer experimentalClassId, + @Param("classId") List classId); + + + /** + * 统计某个班的总错误量 + * + * @param assesmentId + * @param experimentalClassId + * @param classId + * @return + */ + @Select({""}) + Integer queryRight(@Param("assesmentId") Integer assesmentId, @Param("experimentalClassId") Integer experimentalClassId, + @Param("classId") List classId); + + + /** + * 统计该项目的判分点数量 + * (select experimentId from assessment where id=#{assesmentId}) + * + * @return + */ + @Select("select count(judgmentPointsId) from hr_judgment_points where FIND_IN_SET(#{projectId},projectId)") + Integer queryPointNumber(Integer projectId); + + + /** + * 错误分布 + * + * @param assesmentId + * @param experimentalClassId + * @param classId + * @return + */ + @Select({""}) + List queryError(@Param("assesmentId") Integer assesmentId, @Param("experimentalClassId") Integer experimentalClassId, + @Param("classId") List classId); + + + @Select({""}) + List> queryScore3(@Param("assesmentId") Integer assesmentId, @Param("experimentalClassId") Integer experimentalClassId, + @Param("classId") List classId); + + + //开始考核 + @Select("select id,assesmentName,timesum from assessment where courseId=#{courseId} and releaseType=0 and assesmentState=0") + List releaseAssesment(Integer courseId); } diff --git a/src/main/java/com/yipin/liuwanr/service/AssesmentService.java b/src/main/java/com/yipin/liuwanr/service/AssesmentService.java index 68c9cb3..c828ae4 100644 --- a/src/main/java/com/yipin/liuwanr/service/AssesmentService.java +++ b/src/main/java/com/yipin/liuwanr/service/AssesmentService.java @@ -300,13 +300,13 @@ public class AssesmentService { /** * 查询实验班级一级栏目 * - * @param schoolId：学校id + * @param staffId：教师id * @return */ - public HashMap queryCretionTime(Integer schoolId) { + public HashMap queryCretionTime(Integer staffId) { HashMap resp = new HashMap(); try { - resp.put("retvalue", mapper.queryCreationTime(schoolId)); + resp.put("retvalue", mapper.queryCreationTime(staffId)); resp.put("retcode", 200); } catch (Exception e) { logger.error(e.getMessage()); @@ -324,10 +324,10 @@ public class AssesmentService { * @param cretionTime * @return */ - public HashMap queryCretionTime(String cretionTime, Integer schoolId) { + public HashMap queryCretionTime(String cretionTime, Integer staffId) { HashMap resp = new HashMap(); try { - resp.put("retvalue", mapper.queryExperimentalClass(cretionTime, schoolId)); + resp.put("retvalue", mapper.queryExperimentalClass(cretionTime, staffId)); resp.put("retcode", 200); } catch (Exception e) { logger.error(e.getMessage()); @@ -341,7 +341,6 @@ public class AssesmentService { /** * 考核信息展示 - * * @param assesmentId * @return */ diff --git a/src/main/java/com/yipin/liuwanr/service/MakeuplistService.java b/src/main/java/com/yipin/liuwanr/service/MakeuplistService.java index 00b00d3..71db7ea 100644 --- a/src/main/java/com/yipin/liuwanr/service/MakeuplistService.java +++ b/src/main/java/com/yipin/liuwanr/service/MakeuplistService.java @@ -36,14 +36,15 @@ public class MakeuplistService { * @param staffId * @return */ - public HashMap queryAllMakeuplist(Integer staffId,String uploadTime,Integer uploadType,Integer schoolId) { + public HashMap queryAllMakeuplist(Integer staffId,long uploadTime,Integer uploadType,Integer schoolId) { HashMap resp = new HashMap(); + String time= AssesmentHelper.longPointDate(uploadTime); try { if(uploadType.equals(0)){ - List makeuplists=makeuplistMapper.queryExperimentalClassMakeuplist(staffId,uploadTime,schoolId); + List makeuplists=makeuplistMapper.queryExperimentalClassMakeuplist(staffId,time,schoolId); resp.put("retvalue", makeuplists); }else if(uploadType.equals(1)){ - List makeuplists=makeuplistMapper.queryClassMakeuplist(staffId,uploadTime,schoolId); + List makeuplists=makeuplistMapper.queryClassMakeuplist(staffId,time,schoolId); resp.put("retvalue", makeuplists); } resp.put("retcode", 200); @@ -56,10 +57,11 @@ public class MakeuplistService { return resp; } - public HashMap getStudent(Integer staffId,String uploadTime,Integer uploadType,Integer schoolId){ + public HashMap getStudent(Integer staffId,long uploadTime,Integer uploadType,Integer schoolId){ HashMap resp = new HashMap(); + String time= AssesmentHelper.longPointDate(uploadTime); try{ - resp.put("retvalue",makeuplistMapper.getstudent(staffId,uploadTime,schoolId)); + resp.put("retvalue",makeuplistMapper.getstudent(staffId,time,schoolId)); resp.put("retcode", 200); }catch (RuntimeException e){ logger.error(e.getMessage()); @@ -72,14 +74,15 @@ public class MakeuplistService { - public HashMap getByMakeuplist(Integer staffId,String uploadTime,Integer uploadType,Integer schoolId){ + public HashMap getByMakeuplist(Integer staffId,long uploadTime,Integer uploadType,Integer schoolId){ HashMap resp = new HashMap(); + String time= AssesmentHelper.longPointDate(uploadTime); try{ if(uploadType.equals(0)){ - List makeuplists=makeuplistMapper.queryExperimentalClassMakeuplist(staffId,uploadTime,schoolId); + List makeuplists=makeuplistMapper.queryExperimentalClassMakeuplist(staffId,time,schoolId); resp.put("retvalue", makeuplists); }else if(uploadType.equals(1)){ - List makeuplists=makeuplistMapper.queryClassMakeuplist(staffId,uploadTime,schoolId); + List makeuplists=makeuplistMapper.queryClassMakeuplist(staffId,time,schoolId); resp.put("retvalue", makeuplists); } resp.put("retcode", 200);