From 9c755b34a63b66b4d2b619d30290d79bb7cfdbac Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 10 Sep 2021 15:50:20 +0800
Subject: [PATCH] 考试详情
---
src/main/java/org/springblade/modules/exam/service/ExamScoreService.java | 7 +++++++
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.java | 8 ++++++++
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 10 ++++++++++
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 22 ++++++++++++++++++++--
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 12 ++++++++++++
5 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
index a4ab7cf..20d7f6e 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -334,4 +334,16 @@
cjhz.put("sccj",sccj);
return R.data(cjhz);
}
+
+ /**
+ * 自定义分页
+ *
+ * @param query page,size
+ */
+ @GetMapping("/score-page")
+ public R<IPage<ExamScoreVO>> scorePage(Query query, String deptid, String jurisdiction) {
+ IPage<ExamScoreVO> pages = examScoreService.scorePage(Condition.getPage(query),deptid,jurisdiction);
+ return R.data(pages);
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.java b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.java
index e20d61d..90f98f7 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.java
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.java
@@ -26,6 +26,14 @@
List<ExamScoreVO> selectExamScorePage(IPage page, @Param("examScore") ExamScoreVO examScore);
/**
+ * 自定义分页
+ *
+ * @param page 分页
+ * @return
+ */
+ List<ExamScoreVO> scorePage(IPage page,String deptid,String jurisdiction);
+
+ /**
* 自定义分页-模拟考试
*
* @param page 分页
diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
index b9a6a7e..f0c786d 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -189,7 +189,7 @@
exam_score exam
LEFT JOIN blade_user user ON exam.user_id = user.id
WHERE 1 = 1 AND theory_grade is not null
- <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
AND user.jurisdiction = #{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
@@ -207,7 +207,7 @@
exam_score exam
LEFT JOIN blade_user user ON exam.user_id = user.id
WHERE 1 = 1 AND learn_grade is not null
- <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
AND user.jurisdiction = #{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
@@ -217,6 +217,24 @@
exam.learn_grade
</select>
+ <select id="scorePage" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
+ SELECT
+ exam.*,
+ user.jurisdiction,
+ user.dept_id
+ FROM
+ exam_score exam
+ LEFT JOIN blade_user user ON exam.user_id = user.id
+ WHERE
+ 1 = 1
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ AND user.jurisdiction = #{jurisdiction}
+ </if>
+ <if test="deptid!=null and deptid!=''">
+ AND user.dept_id = #{deptid}
+ </if>
+ </select>
+
<!--根据用户身份证号查询考试成绩-->
<select id="getExamScoreInfoByIdCardNo" resultType="org.springblade.modules.exam.entity.ExamScore">
select
diff --git a/src/main/java/org/springblade/modules/exam/service/ExamScoreService.java b/src/main/java/org/springblade/modules/exam/service/ExamScoreService.java
index 662d911..840045e 100644
--- a/src/main/java/org/springblade/modules/exam/service/ExamScoreService.java
+++ b/src/main/java/org/springblade/modules/exam/service/ExamScoreService.java
@@ -24,6 +24,13 @@
IPage<ExamScoreVO> selectExamScorePage(IPage<ExamScoreVO> page, ExamScoreVO examScore);
/**
+ * 自定义分页
+ * @param page
+ * @return
+ */
+ IPage<ExamScoreVO> scorePage(IPage<ExamScoreVO> page,String deptid,String jurisdiction);
+
+ /**
* 详情
* @param examScore 考试成绩信息对象
* @return
diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
index f5cc414..c518aef 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
@@ -80,6 +80,16 @@
}
/**
+ * 自定义分页数据
+ * @param page 分页条件
+ * @return
+ */
+ @Override
+ public IPage<ExamScoreVO> scorePage(IPage<ExamScoreVO> page,String deptid,String jurisdiction) {
+ return page.setRecords(baseMapper.scorePage(page,deptid,jurisdiction));
+ }
+
+ /**
* 详情
* @param examScore 考试成绩信息对象
*/
--
Gitblit v1.9.3