From c8ebf3038d2a7f69d9eb40f5a276dc3fa826fa9b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 10 Aug 2021 21:42:52 +0800
Subject: [PATCH] 报名接口修改,考试计算成绩接口修改,对比答案修改为对比所有题目
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 242 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 241 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
index b002fc8..6eb943b 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -92,12 +92,219 @@
FROM
blade_dept dept
WHERE
- dept.parent_id = #{param2} AND dept.is_deleted = 0
+ dept.is_deleted = 0
+ <if test="param2!=null and param2!=0">
+ and dept.parent_id = #{param2}
+ </if>
<if test="param1!=null and param1!=''">
and dept.tenant_id = #{param1}
</if>
ORDER BY dept.sort
</select>
+
+ <select id="securityLazyTree" resultMap="treeNodeResultMap" >
+ SELECT
+ dept.id,
+ dept.parent_id,
+ dept.dept_name AS title,
+ dept.id AS "value",
+ dept.id AS "key",
+ (
+ SELECT
+ CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+ FROM
+ blade_dept
+ WHERE
+ parent_id = dept.id and is_deleted = 0
+ ) AS "has_children"
+ FROM
+ blade_dept dept
+ WHERE
+ dept.parent_id = #{param2} AND dept.is_deleted = 0
+ and dept_category = 1
+ <if test="param1!=null and param1!=''">
+ and dept.tenant_id = #{param1}
+ </if>
+ ORDER BY dept.sort
+ </select>
+
+ <!--懒加载获取部门树形结构(按分类查询)-->
+ <select id="lazyTreeType" resultMap="treeNodeResultMap" >
+ SELECT
+ dept.id,
+ dept.parent_id,
+ dept.dept_name AS title,
+ dept.id AS "value",
+ dept.id AS "key",
+ (
+ SELECT
+ CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+ FROM
+ blade_dept
+ WHERE
+ parent_id = dept.id and is_deleted = 0
+ ) AS "has_children"
+ FROM
+ blade_dept dept
+ WHERE
+ dept.parent_id = #{param3} AND dept.is_deleted = 0
+ <if test="param2!=null and param2!=''">
+ and dept.dept_category = #{param2}
+ </if>
+ <if test="param1!=null and param1!=''">
+ and dept.tenant_id = #{param1}
+ </if>
+ ORDER BY dept.sort
+ </select>
+
+ <!--懒加载获取部门树形结构(包含用户数据)app-->
+ <select id="lazyTreeUserApp" resultType="org.springblade.modules.system.vo.DeptAndUserVO" >
+ select DISTINCT * from (
+ (SELECT
+ dept.id,
+ dept.parent_id,
+ dept.dept_name AS label,
+ dept.id AS "key",
+ dept.id AS "value",
+ 1 as idCardNo,
+ (
+ SELECT
+ CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+ FROM
+ blade_dept
+ WHERE
+ parent_id = dept.id and dept.is_deleted = 0
+ ) AS "has_children"
+ FROM
+ blade_dept dept
+ left join
+ blade_user bu
+ on
+ bu.dept_id = dept.id
+ WHERE
+ dept.is_deleted = 0
+ <if test="type==1">
+ and dept_category=1
+ AND dept.parent_id = "1413470343230877697"
+ </if>
+ <if test="type==2 or type==3">
+ and dept_category=2
+ AND dept.parent_id = "1123598813738675201"
+ </if>
+ <if test="type==4 and jurisdiction!=null and jurisdiction!=''">
+ and dept_category=1
+ AND dept.parent_id = "1413470343230877697"
+ and bu.jurisdiction = #{jurisdiction}
+ </if>
+ )
+
+ union all
+
+ (select
+ bu.id,
+ bu.dept_id parent_id,
+ bu.real_name AS label,
+ bu.id AS "key",
+ bu.id AS "value",
+ bu.cardid as idCardNo,
+ 0 as "has_children"
+ from blade_user bu
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
+ where 1=1
+ <if test="type==1">
+ and dept_category=1
+ </if>
+ <if test="type==2 or type==3">
+ and dept_category=2
+ </if>
+ <if test="type==4 and jurisdiction!=null and jurisdiction!=''">
+ and dept_category=1
+ and bu.jurisdiction = #{jurisdiction}
+ </if>
+ )
+ )c
+ </select>
+
+ <!--懒加载获取部门树形结构(包含用户数据)-->
+ <select id="lazyTreeUser" resultMap="treeNodeResultMap" >
+ select DISTINCT * from (
+ (SELECT
+ dept.id,
+ dept.parent_id,
+ dept.dept_name AS title,
+ dept.id AS "value",
+ dept.id AS "key",
+ (
+ SELECT
+ CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+ FROM
+ blade_dept
+ WHERE
+ parent_id = dept.id and is_deleted = 0
+ ) AS "has_children"
+ FROM
+ blade_dept dept
+ WHERE
+ dept.is_deleted = 0
+ <if test="parentId!=null and parentId!=''">
+ and dept_category=1
+ AND dept.id = #{parentId}
+ </if>
+ )
+
+ union
+
+ (select
+ bu.id,
+ bu.dept_id parent_id,
+ bu.real_name AS title,
+ bu.id AS "value",
+ bu.id AS "key",
+ 0 as "has_children"
+ from blade_user bu
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
+ where 1=1
+ <if test="parentId!=null and parentId!=''">
+ and dept_category=1
+ AND bu.dept_id = #{parentId}
+ </if>
+ )
+ )c
+ </select>
+
+
+
+ <select id="lazyTrees" resultMap="treeNodeResultMap" >
+ SELECT
+ dept.id,
+ dept.parent_id,
+ dept.dept_name AS title,
+ dept.id AS "value",
+ dept.id AS "key",
+ (
+ SELECT
+ CASE WHEN count(1) > 0 THEN 0 ELSE 1 END
+ FROM
+ blade_dept
+ WHERE
+ parent_id = dept.id and is_deleted = 0
+ ) AS "has_children"
+ FROM
+ blade_dept dept WHERE (
+ SELECT
+ CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+ FROM
+ blade_dept
+ WHERE
+ parent_id = dept.id and is_deleted = 0
+ ) =1
+</select>
<select id="getDeptNames" resultType="java.lang.String">
SELECT
@@ -112,4 +319,37 @@
and is_deleted = 0
</select>
+ <select id="selectIn" resultType="java.util.HashMap">
+ SELECT
+ id as deptid,
+ dept_name as deptname
+ FROM
+ blade_dept where is_deleted = 0
+ </select>
+
+ <!--统计单位类型数量-->
+ <select id="selectCount" resultType="java.util.HashMap">
+ SELECT dept.id as jurisdiction,dept.dept_name AS title FROM blade_dept dept WHERE dept.dept_name like concat(concat('%', #{name}),'%')
+ </select>
+
+ <select id="selectHold" resultType="java.util.HashMap">
+ SELECT
+ ISNULL(B.cz,0) as cz,
+ ISNULL(C.wcz,0) as wcz
+ FROM (SELECT jurisdiction FROM blade_user ) A
+ LEFT JOIN (SELECT COUNT(hold) as cz,jurisdiction FROM blade_user WHERE hold=0 GROUP BY jurisdiction ) B ON A.jurisdiction=B.jurisdiction
+ LEFT JOIN (SELECT COUNT(hold) as wcz,jurisdiction FROM blade_user WHERE hold=1 GROUP BY jurisdiction ) C ON A.jurisdiction=C.jurisdiction
+ WHERE A.jurisdiction=#{deptid} GROUP BY cz,wcz
+ </select>
+
+ <!--查询部门下面的所有单位-->
+ <select id="selectId" resultType="java.util.HashMap">
+ SELECT id FROM blade_dept WHERE parent_id =#{id} and is_deleted = 0
+ </select>
+
+
+ <insert id="add" parameterType="org.springblade.modules.system.entity.Dept" useGeneratedKeys="true" keyProperty="id">
+ insert into blade_dept(tenant_id, parent_id,ancestors,dept_category,dept_name) values(#{tenantId}, #{parentId}, #{ancestors}, #{deptCategory}, #{deptName})
+ </insert>
+
</mapper>
--
Gitblit v1.9.3