From 2ad27a5a23c354b22b81f3d151faaef88c98686b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 14 Aug 2021 08:48:33 +0800
Subject: [PATCH] 报名查询接口同步
---
src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml | 41 +++++++++++++-------
src/main/java/org/springblade/modules/investigate/Investigate.java | 6 ---
src/main/java/org/springblade/modules/apply/vo/ApplyVO.java | 21 ++++++++++
src/main/java/org/springblade/modules/apply/entity/Apply.java | 2 +
4 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/entity/Apply.java b/src/main/java/org/springblade/modules/apply/entity/Apply.java
index c52747d..b07fa44 100644
--- a/src/main/java/org/springblade/modules/apply/entity/Apply.java
+++ b/src/main/java/org/springblade/modules/apply/entity/Apply.java
@@ -158,11 +158,13 @@
/**
* 审核状态
*/
+ @TableField("examination_type")
private String examinationType;
/**
* 审核明细
*/
+ @TableField("examination_mx")
private String examinationMx;
/**
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 805df78..6f5b18d 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -5,28 +5,41 @@
<!--考试报名分页信息-->
<select id="selectApplyPage" resultType="org.springblade.modules.apply.vo.ApplyVO">
SELECT
- sa.id,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
- ke.total_score paperScore,ke.exam_type examType,ke.start_time examTime,ke.exam_name examName,
- bu.real_name realName,sa.examination_type,sa.examination_mx,
- bd.dept_name deptName
+ sa.id,sa.apply_status applyStatus,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
+ sa.examination_type examinationType,sa.examination_mx examinationMx,
+ ke.total_score paperScore,ke.exam_type examType,ke.start_time examTime,ke.exam_name examName,
+ bu.real_name realName,bu.is_apply isApply,
+ bd.dept_name deptName,bu.cardid idCardNo,"保安证" applyCard
FROM
- sys_apply sa
+ sys_apply sa
left join
- ksxt_exam ke
+ ksxt_exam ke
on
- sa.exam_id = ke.id
+ sa.exam_id = ke.id
left join
- blade_user bu
+ blade_user bu
on
- sa.user_id = bu.id
+ sa.user_id = bu.id
left join
- blade_dept bd
+ blade_dept bd
on
- bd.id = bu.dept_id
+ bd.id = bu.dept_id
WHERE
- 1=1
- <if test="apply.name!=null and apply.name!=''">
- and sa.name like concat('%', #{apply.name},'%')
+ 1=1
+ and is_exam = 1
+ and sa.apply_status = 2
+ and bu.is_apply = 1
+ <if test="apply.realName!=null and apply.realName!=''">
+ and bu.real_name like concat('%', #{apply.realName},'%')
+ </if>
+ <if test="apply.deptName!=null and apply.deptName!=''">
+ and bd.dept_name like concat('%', #{apply.deptName},'%')
+ </if>
+ <if test="apply.userId!=null and apply.userId!=''">
+ and sa.user_id like concat('%', #{apply.userId},'%')
+ </if>
+ <if test="apply.examinationType!=null and apply.examinationType!=''">
+ and sa.examination_type = #{apply.examinationType}
</if>
<if test="apply.applyStatus!=null">
and apply_status = #{apply.applyStatus}
diff --git a/src/main/java/org/springblade/modules/apply/vo/ApplyVO.java b/src/main/java/org/springblade/modules/apply/vo/ApplyVO.java
index 15d2a0b..4af9528 100644
--- a/src/main/java/org/springblade/modules/apply/vo/ApplyVO.java
+++ b/src/main/java/org/springblade/modules/apply/vo/ApplyVO.java
@@ -63,8 +63,29 @@
private String idCardNo;
/**
+ * 报考的证件
+ */
+ private String applyCard;
+
+ /**
+ * 用户ids
+ */
+ private String userIds;
+
+ /**
+ * 报名状态
+ */
+ private Integer isApply;
+
+ /**
* 保安姓名
*/
private String realName;
+
+ /**
+ * 性别 1：男 2：女
+ */
+ private Integer sex;
+
}
diff --git a/src/main/java/org/springblade/modules/investigate/Investigate.java b/src/main/java/org/springblade/modules/investigate/Investigate.java
index ad3a4a4..eaf6a4d 100644
--- a/src/main/java/org/springblade/modules/investigate/Investigate.java
+++ b/src/main/java/org/springblade/modules/investigate/Investigate.java
@@ -38,16 +38,10 @@
*/
@PostMapping("/investigate/testBody")
public String testBody(@RequestBody String body){
- System.out.println("body = " + body);
JSONObject jsonObject = new JSONObject(body);
Object data = jsonObject.get("data");
- System.out.println("data = " + data.toString());
JSONObject jsonData = new JSONObject(data.toString());
- Object res = jsonData.get("res");
- System.out.println("res = " + res);
JSONArray jsonArray = jsonData.getJSONArray("res");
- System.out.println("jsonArray = " + jsonArray);
- System.out.println("jsonArray.length() = " + jsonArray.length());
if (jsonArray.length()>0){
String zdxsfzqkry = jsonArray.getJSONObject(0).get("zdxsfzqkry").toString();
return zdxsfzqkry;
--
Gitblit v1.9.3