From 81dcd6b9c960875a4b0d083ac848c7649d95ce13 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 10 七月 2024 18:01:20 +0800
Subject: [PATCH] fix 用户列表增加部门条件 随机试卷列表增加部门，时间，科目条件 补考直接展示学生
---
src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java | 10 +++++
src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java | 4 +-
src/main/resources/mapper/ExamTemplatesMapper.xml | 12 ++++++
src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java | 7 +++
src/main/java/com/mindskip/xzs/controller/admin/UserController.java | 10 +++++
src/main/java/com/mindskip/xzs/repository/UserMapper.java | 4 ++
src/main/java/com/mindskip/xzs/service/UserService.java | 14 +++++++
src/main/resources/mapper/UserMapper.xml | 22 +++++++++++
8 files changed, 81 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java b/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
index df1f7a2..49e7bb7 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
@@ -42,8 +42,8 @@
return RestResponse.ok();
}
- @RequestMapping(value = "/list", method = RequestMethod.GET)
- public RestResponse<PageInfo<ExamTemplatesVO>> list(ExamTemplatesVO examTemplatesVO) throws Exception {
+ @RequestMapping(value = "/list", method = RequestMethod.POST)
+ public RestResponse<PageInfo<ExamTemplatesVO>> list(@RequestBody ExamTemplatesVO examTemplatesVO) throws Exception {
// 濡傛灉鏄儴闂ㄧ鐞嗗憳锛岄渶瑕佸仛鏁版嵁鏉冮檺
examTemplatesVO.setDeptId(ObjectUtils.isNotEmpty(examTemplatesVO.getDeptId()) ? examTemplatesVO.getDeptId() : getAdminDeptIds());
PageInfo<ExamTemplates> pageInfo = examTemplatesService.getByadmins(examTemplatesVO);
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
index 99ce044..d155005 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
@@ -231,4 +231,14 @@
return RestResponse.ok();
}
+ @GetMapping("/getFailExamUser/{examPaperId}")
+ public RestResponse<List<User>> getFailExamUser(@PathVariable Integer examPaperId) {
+ return RestResponse.ok(userService.getFailExamUser(examPaperId));
+ }
+
+ @GetMapping("/getFailTemplateUser/{templateId}")
+ public RestResponse<List<User>> getFailTemplateUser(@PathVariable Integer templateId) {
+ return RestResponse.ok(userService.getFailTemplateUser(templateId));
+ }
+
}
diff --git a/src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java b/src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java
index f6708ed..3d4423e 100644
--- a/src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java
+++ b/src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java
@@ -1,5 +1,6 @@
package com.mindskip.xzs.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.mindskip.xzs.base.BasePage;
import lombok.Data;
@@ -15,6 +16,7 @@
private String name;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date ctime;
private LocalDateTime now;
@@ -41,4 +43,9 @@
private Integer createUser;
+ /**
+ * 鏃堕棿鍛ㄦ湡
+ */
+ private List<LocalDateTime> period;
+
}
diff --git a/src/main/java/com/mindskip/xzs/repository/UserMapper.java b/src/main/java/com/mindskip/xzs/repository/UserMapper.java
index 2bb45b8..4354f1e 100644
--- a/src/main/java/com/mindskip/xzs/repository/UserMapper.java
+++ b/src/main/java/com/mindskip/xzs/repository/UserMapper.java
@@ -174,4 +174,8 @@
User getUserByExamByTemplateId(ExamPaper examPaper);
List<Integer> getDeptIds(@Param("userId") Integer userId);
+
+ List<User> getFailExamUser(Integer examPaperId);
+
+ List<User> getFailTemplateUser(Integer templateId);
}
diff --git a/src/main/java/com/mindskip/xzs/service/UserService.java b/src/main/java/com/mindskip/xzs/service/UserService.java
index eb652a4..0b5753f 100644
--- a/src/main/java/com/mindskip/xzs/service/UserService.java
+++ b/src/main/java/com/mindskip/xzs/service/UserService.java
@@ -152,4 +152,18 @@
* @return
*/
List<Integer> getDeptIds(Integer id);
+
+ /**
+ * 鑾峰彇闇�瑕佽ˉ鑰冪殑鐢ㄦ埛
+ * @param examPaperId 璇曞嵎id
+ * @return 鐢ㄦ埛涓嬫媺
+ */
+ List<User> getFailExamUser(Integer examPaperId);
+
+ /**
+ * 鑾峰彇闇�瑕佽ˉ鑰冪殑鐢ㄦ埛
+ * @param templateId 闅忔満璇曞嵎id
+ * @return 鐢ㄦ埛涓嬫媺
+ */
+ List<User> getFailTemplateUser(Integer templateId);
}
diff --git a/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java
index 13d3696..a894226 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java
@@ -206,4 +206,14 @@
public List<Integer> getDeptIds(Integer userId) {
return userMapper.getDeptIds(userId);
}
+
+ @Override
+ public List<User> getFailExamUser(Integer examPaperId) {
+ return userMapper.getFailExamUser(examPaperId);
+ }
+
+ @Override
+ public List<User> getFailTemplateUser(Integer templateId) {
+ return userMapper.getFailTemplateUser(templateId);
+ }
}
diff --git a/src/main/resources/mapper/ExamTemplatesMapper.xml b/src/main/resources/mapper/ExamTemplatesMapper.xml
index cfb27e4..8dffc26 100644
--- a/src/main/resources/mapper/ExamTemplatesMapper.xml
+++ b/src/main/resources/mapper/ExamTemplatesMapper.xml
@@ -60,6 +60,8 @@
, e.name, e.paper_type, e.suggest_time, e.title_name, e.ctime, e.status, e.menu_ids,e.start_time,e.end_time, e.create_user
from t_exam_templates e
left join t_exam_templates_user u on e.id = u.templates_id
+ LEFT JOIN t_exam_templates_subject ts ON e.id = ts.templates_id
+ LEFT JOIN t_subject s ON ts.subject_id = s.id
<where>
<if test="status != null">
and e.status = 0
@@ -73,10 +75,20 @@
<if test="deptId != null and deptId.size() > 0">
and e.dept_id in <foreach collection="deptId" item="item" separator="," open="(" close=")"> #{item} </foreach>
</if>
+ <if test="name != null and name != ''">
+ and INSTR(e.name, #{name})
+ </if>
+ <if test="subjectId != null and subjectId.length > 0">
+ and s.id in <foreach collection="subjectId" item="item" separator="," open="(" close=")"> #{item} </foreach>
+ </if>
+ <if test="period != null and period.size() > 0">
+ and e.ctime between #{period[0]} and #{period[1]}
+ </if>
<if test="now !=null">
and #{now} between e.start_time and e.end_time
</if>
</where>
+ GROUP BY e.id
</select>
<select id="getById" resultMap="BaseResultMap">
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index f8c619d..099b1d3 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -573,4 +573,26 @@
SELECT department_id FROM t_user_department WHERE user_id = #{userId} AND dept_admin != 1
</select>
+ <select id="getFailExamUser" resultType="com.mindskip.xzs.domain.User">
+ <![CDATA[
+ SELECT
+ DISTINCT d.id, d.real_name
+ FROM t_exam_paper a
+ LEFT JOIN t_exam_paper_user b ON a.id = b.exam_paper_id AND b.deleted = 0
+ LEFT JOIN t_exam_paper_answer c ON a.id = c.exam_paper_id AND c.create_user = b.user_id
+ LEFT JOIN t_user d ON b.user_id = d.id
+ WHERE a.id = #{examPaperId}
+ AND (c.id IS NULL OR (user_score / paper_score) < 0.6)
+ ]]>
+ </select>
+
+ <select id="getFailTemplateUser" resultType="com.mindskip.xzs.domain.User">
+ SELECT *
+ FROM t_user
+ WHERE id IN
+ (SELECT user_id FROM t_exam_templates_user WHERE templates_id = #{id} AND user_id NOT IN
+ (SELECT create_user FROM t_exam_paper_answer WHERE (user_score / paper_score) > 0.6 AND (invalid = 0 OR invalid IS NULL) AND exam_paper_id IN
+ (SELECT exam_paper_id FROM t_exam_templates_user_count WHERE exam_templates_id = #{templateId})))
+ </select>
+
</mapper>
--
Gitblit v1.8.0