From c09344cd536257fe7d71435840508f11d8269242 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 24 七月 2024 15:06:00 +0800
Subject: [PATCH] feat：选人增加姓名条件
---
src/main/resources/mapper/ExamPaperMapper.xml | 6 ++----
src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
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 ab8904c..5fc674a 100644
--- a/src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java
+++ b/src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java
@@ -16,7 +16,7 @@
private String name;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date ctime;
private LocalDateTime now;
diff --git a/src/main/resources/mapper/ExamPaperMapper.xml b/src/main/resources/mapper/ExamPaperMapper.xml
index 92cf7f6..60c9e29 100644
--- a/src/main/resources/mapper/ExamPaperMapper.xml
+++ b/src/main/resources/mapper/ExamPaperMapper.xml
@@ -483,11 +483,9 @@
where
user_name != 'admin' and a.status != 2 and a.deleted = 0 and (a.`condition` = 0 or a.`condition` is null)
<if test="deptIds != null and deptIds.size > 0">
- and c.department_id in
- <foreach collection="deptIds" open="(" separator="," close=")" item="deptId">
- #{deptId}
- </foreach>
+ and c.department_id in <foreach collection="deptIds" open="(" separator="," close=")" item="deptId"> #{deptId} </foreach>
</if>
+ <if test="realName"> and INSTR(a.real_name, #{realName}) </if>
group by a.id, a.real_name
<if test="(tagIds != null and tagIds.size > 0) or (excludeTagIds != null and excludeTagIds.size > 0)">
having
--
Gitblit v1.8.0