From 18464ca2adbfc5e4e0f4c111be78a29658d96e3d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 27 Aug 2021 22:36:04 +0800
Subject: [PATCH] 题目生成修改，考试成绩计算修改，用户新增接口修改
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index c5d8228..7603447 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -157,7 +157,7 @@
WHERE u.examination_type = 1
GROUP BY u.dept_id,u.jurisdiction
) B ON A.dept_id = B.dept_id
- <if test="jurisdiction!=null and jurisdiction==''">
+ <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201">
WHERE A.jurisdiction = #{jurisdiction}
</if>
<if test="deptid!=null and deptid==''">
@@ -180,7 +180,7 @@
WHERE role_id = '1412226235153731586' AND `status`=1 AND is_deleted=0
AND hold = 2
GROUP BY dept_id,jurisdiction) B ON A.dept_id = B.dept_id
- <if test="jurisdiction!=null and jurisdiction==''">
+ <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201">
WHERE A.jurisdiction = #{jurisdiction}
</if>
<if test="deptid!=null and deptid==''">
@@ -198,12 +198,24 @@
</select>
<select id="selectDisp" resultType="java.util.HashMap">
- SELECT COUNT(d.NAME) AS num,
- u.real_name
- FROM sys_dispatcher d
- LEFT JOIN blade_user u ON u.cardid = d.cardid
- WHERE d.dept_id = #{deptid}
- GROUP BY u.real_name
+ SELECT IFNULL(A.thisnum, 0) AS pnum,
+ IFNULL(B.lastnum, 0) AS wpnum
+ FROM (SELECT COUNT(*) AS thisnum, dept_id,jurisdiction
+ FROM blade_user
+ WHERE role_id = '1412226235153731586' AND `status`=1 AND is_deleted=0
+ AND dispatch = 0
+ GROUP BY dept_id,jurisdiction) A
+ LEFT JOIN (SELECT COUNT(*) AS lastnum, dept_id,jurisdiction
+ FROM blade_user
+ WHERE role_id = '1412226235153731586' AND `status`=1 AND is_deleted=0
+ AND dispatch = 0
+ GROUP BY dept_id,jurisdiction) B ON A.dept_id = B.dept_id
+ <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201">
+ WHERE A.jurisdiction = #{jurisdiction}
+ </if>
+ <if test="deptid!=null and deptid==''">
+ WHERE A.dept_id = #{deptid}
+ </if>
</select>
<select id="selectSoil" resultType="java.util.HashMap">
--
Gitblit v1.9.3