From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改，保安证编码生成修改

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   97 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 120bb98..d61feb3 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -88,7 +88,7 @@
             and bu.role_id = #{user.roleId}
         </if>
         <if test="user.roleAlias!=null and user.roleAlias != ''">
-            and (br.role_alias = '保安' or br.role_alias = '未持证保安')
+            and br.role_alias = '保安'
         </if>
         <if test="user.status!=null and user.status != ''">
             and bu.status = #{user.status}
@@ -232,6 +232,14 @@
         <if test="user.sex!=null and user.sex != ''">
             and bu.sex = #{user.sex}
         </if>
+        <if test="user.dispatch!=null and user.dispatch != ''">
+            <if test="user.dispatch==1">
+                and (bu.dispatch = #{user.dispatch} or bu.dispatch is null)
+            </if>
+            <if test="user.dispatch==0">
+                and bu.dispatch = #{user.dispatch}
+            </if>
+        </if>
         <if test="user.status!=null and user.status != ''">
             and bu.status = #{user.status}
         </if>
@@ -326,9 +334,9 @@
           </if>
     </select>
 
-    <!--查询当前年份已有的保安证编号-->
+    <!--查询当前年份已有的保安证编号,取倒数5位的最大值-->
     <select id="getSecurityPaperCount" resultType="java.lang.Integer">
-        select count(*) from blade_user
+        select ifnull(max(0+RIGHT(securitynumber,5)),0) from blade_user
         where securitynumber like concat('%', #{pre},'%')
     </select>
 
@@ -392,4 +400,87 @@
         bu.dept_id = bd.id
         where bu.id = #{user.id}
     </select>
+
+    <!--获取派遣信息-->
+    <select id="getDispaterInfo" resultType="java.util.HashMap">
+        select bu.*,sdu.jurisdiction from blade_user bu
+        left join
+        sys_dispatcher sd
+        on
+        bu.id = sd.user_ids
+        left join
+        sys_dispatcher_unit sdu
+        on
+        sdu.id = sd.dispatcher_unit_id
+        where
+        bu.dispatch =0
+        and bu.status = 1
+        and bu.is_deleted = 0
+        <if test="deptid!=null and deptid!=''">
+            and bu.dept_id = #{deptid}
+        </if>
+        <if test="jurisdiction!=null and jurisdiction!=''">
+            and sdu.jurisdiction = #{jurisdiction}
+        </if>
+    </select>
+
+    <!--获取工作汇报-->
+    <select id="getWorkReportInfo" resultType="java.util.HashMap">
+        select bu.*,si.jurisdiction from blade_user bu
+        left join
+        blade_dept bd
+        on
+        bd.id = bu.dept_id
+        left join
+        sys_information si
+        on
+        bd.id = si.departmentid
+        where
+        1=1
+        and bu.status = 1
+        and bu.is_deleted = 0
+        <if test="deptid!=null and deptid!=''">
+            and bu.dept_id = #{deptid}
+        </if>
+        <if test="jurisdiction!=null and jurisdiction!=''">
+            and si.jurisdiction = #{jurisdiction}
+            and dept_category=2
+        </if>
+    </select>
+
+
+    <!--获取工作汇报 向民警-->
+    <select id="getWorkReportInfos" resultType="java.util.HashMap">
+        select bu.* from blade_user bu
+        left join
+        blade_dept bd
+        on
+        bd.id = bu.dept_id
+        where
+        1=1
+        and bu.status = 1
+        and bu.is_deleted = 0
+        <if test="deptid!=null and deptid!=''">
+            and bu.dept_id = #{deptid}
+        </if>
+        <if test="jurisdiction!=null and jurisdiction!=''">
+            and bu.jurisdiction = #{jurisdiction}
+            and dept_category=2
+        </if>
+    </select>
+
+    <!--查询用的派遣信息-->
+    <select id="getDispatcherInfoByUserId" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
+        select
+            sd.id,sdu.jurisdiction
+        from
+            sys_dispatcher sd
+        left join
+            sys_dispatcher_unit sdu
+        on
+            sdu.id = sd.dispatcher_unit_id
+        where sd.user_ids = #{userId}
+        and sd.status = 0
+    </select>
+
 </mapper>

--
Gitblit v1.9.3