change пре 4 година
родитељ
комит
5d3c45bdd8

+ 3 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementQueryBo.java

@@ -36,7 +36,9 @@ public class ExamArrangementQueryBo extends BaseEntity {
 	/** 排序的方向desc或者asc */
 	/** 排序的方向desc或者asc */
 	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
 	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
 	private String isAsc;
 	private String isAsc;
-
+	/** 考试类型id */
+	@ApiModelProperty("考试id")
+	private Long examId;
 
 
 	/** 考试类型id */
 	/** 考试类型id */
 	@ApiModelProperty("考试类型id")
 	@ApiModelProperty("考试类型id")

+ 6 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamArrangementStudentServiceImpl.java

@@ -111,6 +111,12 @@ public class ExamArrangementStudentServiceImpl extends ServiceImpl<ExamArrangeme
     @Override
     @Override
     public List<ExamUserVo> querySubList(ExamArrangementQueryBo bo) {
     public List<ExamUserVo> querySubList(ExamArrangementQueryBo bo) {
         List<ExamUserVo> examUserVos = baseMapper.selectSubList(bo);
         List<ExamUserVo> examUserVos = baseMapper.selectSubList(bo);
+        examUserVos.stream().forEach(e -> {
+                    ExamArrangementTimeQueryBo examArrangementTimeQueryBo = new ExamArrangementTimeQueryBo();
+                    examArrangementTimeQueryBo.setArrangement_id(e.getExamId());
+                    e.setExamArrangementTimeVo(examArrangementTimeService.queryList(examArrangementTimeQueryBo));
+                }
+        );
         return entity2UserVo(examUserVos);
         return entity2UserVo(examUserVos);
     }
     }
 
 

+ 5 - 4
zhongzheng-system/src/main/resources/mapper/modules/exam/ExamArrangementStudentMapper.xml

@@ -92,7 +92,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             exam_arrangement_student s
             exam_arrangement_student s
                 LEFT JOIN `user` u ON s.student_id = u.user_id
                 LEFT JOIN `user` u ON s.student_id = u.user_id
                 LEFT JOIN exam_arrangement e ON s.arrangement_id = e.id
                 LEFT JOIN exam_arrangement e ON s.arrangement_id = e.id
-                LEFT JOIN exam_arrangement_time t ON t.arrangement_id = e.id
         WHERE 1=1
         WHERE 1=1
           AND e.status != 0
           AND e.status != 0
         <if test="startTime != null and startTime != ''">
         <if test="startTime != null and startTime != ''">
@@ -110,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="realname != null and realname != ''">
         <if test="realname != null and realname != ''">
             AND u.realname = #{realname}
             AND u.realname = #{realname}
         </if>
         </if>
-
+        GROUP BY s.student_id
     </select>
     </select>
 
 
     <select id="selectSubList" parameterType="com.zhongzheng.modules.exam.bo.ExamArrangementQueryBo" resultMap="UserResult">
     <select id="selectSubList" parameterType="com.zhongzheng.modules.exam.bo.ExamArrangementQueryBo" resultMap="UserResult">
@@ -121,12 +120,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         exam_arrangement_sub s
         exam_arrangement_sub s
         LEFT JOIN `user` u ON s.sub_id = u.user_id
         LEFT JOIN `user` u ON s.sub_id = u.user_id
         LEFT JOIN exam_arrangement e ON s.exam_id = e.id
         LEFT JOIN exam_arrangement e ON s.exam_id = e.id
-        LEFT JOIN exam_arrangement_time t ON t.arrangement_id = e.id
         WHERE 1=1
         WHERE 1=1
         AND e.status != 0
         AND e.status != 0
         <if test="startTime != null and startTime != ''">
         <if test="startTime != null and startTime != ''">
             AND t.start_time BETWEEN #{startTime} and #{endTime}
             AND t.start_time BETWEEN #{startTime} and #{endTime}
         </if>
         </if>
-
+        <if test="examId != null and examId != ''">
+            AND s.exam_id = #{examId}
+        </if>
+        GROUP BY s.student_id
     </select>
     </select>
 </mapper>
 </mapper>