From e8a2c8eeff68395f7d77245db361c6a4846b43bf Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Sep 2021 18:08:48 +0800
Subject: [PATCH] 准考证信息查询修改，新增考试号，地址
---
src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml | 7 ++++++-
src/main/java/org/springblade/modules/apply/vo/ApplyPaPerVO.java | 10 ++++++++++
src/main/java/org/springblade/modules/exam/entity/ExamPaper.java | 6 ++++++
src/main/java/org/springblade/modules/system/entity/User.java | 11 +++++++++++
4 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
index 03fb3bf..3ec9453 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -202,7 +202,8 @@
sa.id,sa.candidate_no candidateNo,
ke.exam_type examType,ke.start_time startTime,ke.end_time endTime,ke.exam_name examName,
bu.real_name realName,bu.cardid idCardNo,ifnull(bu.sex,0) sex,bu.avatar myPicture,
- bd.dept_name deptName,"保安证" applyCard
+ bd.dept_name deptName,"保安证" applyCard,
+ er.exam_room_name examRoomName,er.address,er.exam_room_no examRoomNo
FROM
sys_apply sa
left join
@@ -217,6 +218,10 @@
blade_dept bd
on
bd.id = bu.dept_id
+ left join
+ exam_room er
+ on
+ er.id = ke.exam_room_id
WHERE
sa.id = #{apply.id}
</select>
diff --git a/src/main/java/org/springblade/modules/apply/vo/ApplyPaPerVO.java b/src/main/java/org/springblade/modules/apply/vo/ApplyPaPerVO.java
index 9c1f1b4..7576369 100644
--- a/src/main/java/org/springblade/modules/apply/vo/ApplyPaPerVO.java
+++ b/src/main/java/org/springblade/modules/apply/vo/ApplyPaPerVO.java
@@ -107,4 +107,14 @@
*/
private String address;
+ /**
+ * 考场名称
+ */
+ private String examRoomName;
+
+ /**
+ * 考场号
+ */
+ private String examRoomNo;
+
}
diff --git a/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java b/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java
index b50fd57..7754f7d 100644
--- a/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java
+++ b/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java
@@ -129,5 +129,11 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditTime;
+ /**
+ * 考场号id
+ */
+ @TableField("exam_room_id")
+ private Integer examRoomId;
+
}
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index f1daee6..18256ee 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -238,4 +238,15 @@
@TableField("reason_for_leav")
private String reasonForLeav;
+ private String holdv;
+
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date holdvtime;
+
+ /**
+ * 是否缴纳保险 0：是 1：否
+ */
+ private Integer insurance;
+
}
--
Gitblit v1.9.3