修改补考名单的上传时间,恢复考核管理的实验班级展示

master
pd 4 years ago
parent 7a19fdb90a
commit b904adc2f2
  1. 20
      src/main/java/com/yipin/liuwanr/controller/AssesmentController.java
  2. 6
      src/main/java/com/yipin/liuwanr/controller/MakeuplistController.java
  3. 73
      src/main/java/com/yipin/liuwanr/mapper/AssesmentMapper.java
  4. 11
      src/main/java/com/yipin/liuwanr/service/AssesmentService.java
  5. 19
      src/main/java/com/yipin/liuwanr/service/MakeuplistService.java

@ -246,17 +246,17 @@ public class AssesmentController {
/**
* 查询实验班级一级栏目
* @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<String, Object> ret = service.queryCretionTime(schoolId);
HashMap<String, Object> ret = service.queryCretionTime(staffId);
int status = (int) ret.get("retcode");
if (200 == status) {
resp.setStatus(status);
@ -271,21 +271,21 @@ public class AssesmentController {
/**
* 二级查询实验班级名称以及班级一下的学生
* 查询实验班级名称以及班级一下的学生
* @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<String, Object> ret = service.queryCretionTime(creationTime,schoolId);
HashMap<String, Object> ret = service.queryCretionTime(creationTime,staffId);
int status = (int) ret.get("retcode");
if (200 == status) {
resp.setStatus(status);

@ -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);

@ -25,11 +25,13 @@ 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 " +
@ -39,10 +41,11 @@ public interface AssesmentMapper {
/**
* 考核列表信息查询
*
* @param assesment
* @return
*/
@Select({ "<script>",
@Select({"<script>",
"SELECT a.id,a.assesmentName as assesmentName,a.assessmentSize as assessmentSize,p.projectName as projectName,a.timeSum as timeSum,GROUP_CONCAT(c.className) as className,"
+ "a.releaseType as releaseType,a.creationTime as creationTime,a.endTime as endTime,a.assesmentState as assesmentState FROM "
+ "(assessment a left join hr_project_management p on a.experimentId=p.projectId ) left join class c on FIND_IN_SET(c.classId,a.classId )>0 "
@ -59,9 +62,9 @@ public interface AssesmentMapper {
List<Assesment> getByCondition(Assesment assesment);
/**
* 查询选中的学生有哪些正在参与考核
*
* @param studentIds
* @return
*/
@ -76,16 +79,18 @@ public interface AssesmentMapper {
/**
* 创建考核
*
* @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")
@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}"
@ -96,16 +101,17 @@ public interface AssesmentMapper {
/**
* 添加考核记录
*/
@Insert({ "<script>",
@Insert({"<script>",
"insert into record (projectId,courseId,studentId,assesmentId) values"
+ "<foreach collection = 'studentIds' item='studentId' separator=','>"
+ "(#{projectId},#{courseId},#{studentId},#{assesmentId})" + "</foreach>",
"</script>" })
void insertRecore(@Param("studentIds")List<Integer> studentIds,@Param("projectId")Integer projectId,@Param("courseId")Integer courseId,@Param("assesmentId")Integer assesmentId);
"</script>"})
void insertRecore(@Param("studentIds") List<Integer> studentIds, @Param("projectId") Integer projectId, @Param("courseId") Integer courseId, @Param("assesmentId") Integer assesmentId);
/**
* 根据考核id查询数据
*
* @param id
* @return
*/
@ -117,18 +123,20 @@ public interface AssesmentMapper {
/**
* 查询行政班级id
*
* @param studentIds
* @return
*/
@Select({"<script>","select classId from student WHERE studentId in "
@Select({"<script>", "select classId from student WHERE studentId in "
+ "<foreach collection='studentIds' item='stu' open='(' separator=',' close=')'>#{stu}</foreach> ",
"GROUP BY classId",
"</script>"})
List<String> queryClassId(@Param("studentIds")List<Integer> studentIds);
List<String> queryClassId(@Param("studentIds") List<Integer> studentIds);
/**
* 创建考核时选中的学生
*
* @param assesmentId
* @return
*/
@ -138,19 +146,21 @@ public interface AssesmentMapper {
/**
* 删除多余的记录信息
*
* @param assesmentId
* @param students
*/
@Delete({"<script>","delete from record where assesmentId=#{assesmentId} and studentId in",
@Delete({"<script>", "delete from record where assesmentId=#{assesmentId} and studentId in",
"<foreach collection='students' item='stu' open='(' separator=',' close=')'>" +
"#{stu.studentId} "
+ "</foreach> ",
"</script>"})
void deleteRecord(@Param("assesmentId")Integer assesmentId,@Param("students")List<Student> students);
void deleteRecord(@Param("assesmentId") Integer assesmentId, @Param("students") List<Student> 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")
@ -161,41 +171,41 @@ public interface AssesmentMapper {
* 修改考核状态
*/
@Update({"<script>",
"update assessment set assesmentState=#{assesmentState} "+
"update assessment set assesmentState=#{assesmentState} " +
"<if test='releaseType==0 and assesmentState==1'>,creationTime=#{creationTime},endTime=#{endTime}</if>",
"<if test='assesmentState==2'>,endTime=#{endTime} </if>",
"where id=#{id}" ,
"where id=#{id}",
"</script>"})
void updateAssesmentState(Assesment assesment);
/**
* 查询实验班级一级标题创建时间
* @param schoolId
*
* @param staffId
* @return
*/
@Select("select creationTime from experimental_class_ning WHERE isdel=0 and schoolId = #{schoolId} GROUP BY creationTime ORDER BY creationTime desc")
List<ExperimentalClass> queryCreationTime(Integer schoolId);
@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<String> queryCreationTime(Integer staffId);
/**
* 查询实验班级信息,及班级下的学生
*
* @param creationTime
* @return
*/
@Select("select experimentalClassId,experimentalClassName from experimental_class_ning where isdel=0 and creationTime=#{creationTime} and schoolId = #{schoolId})")
@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") )
@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<ExperimentalClass> queryExperimentalClass(@Param("creationTime") String creationTime,@Param("schoolId") Integer schoolId);
List<ExperimentalClass> queryExperimentalClass(@Param("creationTime") String creationTime, @Param("staffId") Integer staffId);
/**
* 考核名称创建时间结束时间教师名称考核人数实到人数
*
* @param assesmentId
* @return
*/
@ -206,6 +216,7 @@ public interface AssesmentMapper {
/**
* 实验班级
*
* @param assesmentId
* @return
*/
@ -216,6 +227,7 @@ public interface AssesmentMapper {
/**
* 行政班级
*
* @param assesmentId
* @return
*/
@ -225,6 +237,7 @@ public interface AssesmentMapper {
/**
* 查询成绩(升序)
*
* @param assesmentId
* @param experimentalClassId
* @param classId
@ -239,11 +252,12 @@ public interface AssesmentMapper {
+ "</if>",
" and re.score is not null ORDER BY re.score",
"</script>"})
List<Integer> queryScore(Integer assesmentId,@Param("experimentalClassId")Integer experimentalClassId,@Param("classId") List<Integer> classId);
List<Integer> queryScore(Integer assesmentId, @Param("experimentalClassId") Integer experimentalClassId, @Param("classId") List<Integer> classId);
/**
* 分组查询分数和对应人数
*
* @param assesmentId
* @param experimentalClassId
* @param classId
@ -258,12 +272,13 @@ public interface AssesmentMapper {
+ "</if>",
" and re.score is not null GROUP BY re.score",
"</script>"})
List<Record> queryScore2(@Param("assesmentId")Integer assesmentId,@Param("experimentalClassId")Integer experimentalClassId,
List<Record> queryScore2(@Param("assesmentId") Integer assesmentId, @Param("experimentalClassId") Integer experimentalClassId,
@Param("classId") List<Integer> classId);
/**
* 统计某个班的总错误量
*
* @param assesmentId
* @param experimentalClassId
* @param classId
@ -276,13 +291,14 @@ public interface AssesmentMapper {
+ "<foreach collection='classId' item='id' open='and classId in (' separator=',' close=')'>#{id}</foreach>"
+ "</if>",
"</script>"})
Integer queryRight(@Param("assesmentId")Integer assesmentId,@Param("experimentalClassId")Integer experimentalClassId,
Integer queryRight(@Param("assesmentId") Integer assesmentId, @Param("experimentalClassId") Integer experimentalClassId,
@Param("classId") List<Integer> classId);
/**
* 统计该项目的判分点数量
* (select experimentId from assessment where id=#{assesmentId})
*
* @return
*/
@Select("select count(judgmentPointsId) from hr_judgment_points where FIND_IN_SET(#{projectId},projectId)")
@ -291,6 +307,7 @@ public interface AssesmentMapper {
/**
* 错误分布
*
* @param assesmentId
* @param experimentalClassId
* @param classId
@ -304,7 +321,7 @@ public interface AssesmentMapper {
+ "</if>",
"GROUP BY pr.judgmentPointsId",
"</script>"})
List<PointRecord> queryError(@Param("assesmentId")Integer assesmentId,@Param("experimentalClassId")Integer experimentalClassId,
List<PointRecord> queryError(@Param("assesmentId") Integer assesmentId, @Param("experimentalClassId") Integer experimentalClassId,
@Param("classId") List<Integer> classId);
@ -317,7 +334,7 @@ public interface AssesmentMapper {
+ "</if>",
" and re.score is not null",
"</script>"})
List<HashMap<String, Integer>> queryScore3(@Param("assesmentId")Integer assesmentId,@Param("experimentalClassId")Integer experimentalClassId,
List<HashMap<String, Integer>> queryScore3(@Param("assesmentId") Integer assesmentId, @Param("experimentalClassId") Integer experimentalClassId,
@Param("classId") List<Integer> classId);

@ -300,13 +300,13 @@ public class AssesmentService {
/**
* 查询实验班级一级栏目
*
* @param schoolId学校id
* @param staffId教师id
* @return
*/
public HashMap<String, Object> queryCretionTime(Integer schoolId) {
public HashMap<String, Object> queryCretionTime(Integer staffId) {
HashMap<String, Object> resp = new HashMap<String, Object>();
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<String, Object> queryCretionTime(String cretionTime, Integer schoolId) {
public HashMap<String, Object> queryCretionTime(String cretionTime, Integer staffId) {
HashMap<String, Object> resp = new HashMap<String, Object>();
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
*/

@ -36,14 +36,15 @@ public class MakeuplistService {
* @param staffId
* @return
*/
public HashMap<String, Object> queryAllMakeuplist(Integer staffId,String uploadTime,Integer uploadType,Integer schoolId) {
public HashMap<String, Object> queryAllMakeuplist(Integer staffId,long uploadTime,Integer uploadType,Integer schoolId) {
HashMap<String, Object> resp = new HashMap<String, Object>();
String time= AssesmentHelper.longPointDate(uploadTime);
try {
if(uploadType.equals(0)){
List<Makeuplist> makeuplists=makeuplistMapper.queryExperimentalClassMakeuplist(staffId,uploadTime,schoolId);
List<Makeuplist> makeuplists=makeuplistMapper.queryExperimentalClassMakeuplist(staffId,time,schoolId);
resp.put("retvalue", makeuplists);
}else if(uploadType.equals(1)){
List<Makeuplist> makeuplists=makeuplistMapper.queryClassMakeuplist(staffId,uploadTime,schoolId);
List<Makeuplist> 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<String, Object> getStudent(Integer staffId,String uploadTime,Integer uploadType,Integer schoolId){
public HashMap<String, Object> getStudent(Integer staffId,long uploadTime,Integer uploadType,Integer schoolId){
HashMap<String, Object> resp = new HashMap<String, Object>();
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<String, Object> getByMakeuplist(Integer staffId,String uploadTime,Integer uploadType,Integer schoolId){
public HashMap<String, Object> getByMakeuplist(Integer staffId,long uploadTime,Integer uploadType,Integer schoolId){
HashMap<String, Object> resp = new HashMap<String, Object>();
String time= AssesmentHelper.longPointDate(uploadTime);
try{
if(uploadType.equals(0)){
List<Makeuplist> makeuplists=makeuplistMapper.queryExperimentalClassMakeuplist(staffId,uploadTime,schoolId);
List<Makeuplist> makeuplists=makeuplistMapper.queryExperimentalClassMakeuplist(staffId,time,schoolId);
resp.put("retvalue", makeuplists);
}else if(uploadType.equals(1)){
List<Makeuplist> makeuplists=makeuplistMapper.queryClassMakeuplist(staffId,uploadTime,schoolId);
List<Makeuplist> makeuplists=makeuplistMapper.queryClassMakeuplist(staffId,time,schoolId);
resp.put("retvalue", makeuplists);
}
resp.put("retcode", 200);

Loading…
Cancel
Save