From 3432fad3ebcecd73d3d50fa8dfb7934cc61cfd06 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 16 Aug 2021 15:04:16 +0800
Subject: [PATCH] 保安员查询新增审查排序

---
 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml |  217 +++++++++++++++++++++++++++++------------------------
 1 files changed, 119 insertions(+), 98 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 013d3cb..220ac1c 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -734,6 +734,12 @@
         <if test="deptid!=null and deptid!=''">
             and u.dept_id =#{deptid}
         </if>
+        <if test="type!=null and type=='1'">
+            and to_days(u.update_time) = to_days(now());
+        </if>
+        <if test="type!=null and type=='2'">
+            and DATE_FORMAT(u.update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+        </if>
         GROUP BY d.dept_name,
         j.dept_name
     </select>
@@ -752,6 +758,12 @@
         <if test="deptid!=null and deptid!=''">
             and u.departmentid =#{deptid}
         </if>
+        <if test="type!=null and type=='1'">
+            and to_days(u.time) = to_days(now());
+        </if>
+        <if test="type!=null and type=='2'">
+            and DATE_FORMAT(u.time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+        </if>
         GROUP BY d.dept_name,
         j.dept_name
     </select>
@@ -761,6 +773,15 @@
         SELECT id, dept_name
         FROM sys_jurisdiction
         WHERE id!=1123598813738675201
+    </select>
+
+    <select id="selectExtypeUser" resultType="java.lang.Integer">
+        SELECT
+            COUNT( CASE WHEN ( examination_mx IS NOT NULL OR examination_mx != "" ) THEN 1 END ) AS sum
+        FROM
+            blade_user
+        WHERE
+            STATUS != 1
     </select>
 
     <!--派遣保安人數量-->
@@ -806,107 +827,107 @@
     </delete>
 
 
-
     <select id="selectLi" resultType="java.util.HashMap">
         SELECT
-            IFNULL( A.num, 0 ) AS num,
-            IFNULL( B.cznum, 0 ) AS cznum,
-            IFNULL( C.paiqnum, 0 ) AS paiqnum,
-            IFNULL( D.wpaiqnum, 0 ) AS wpaiqnum,
-            IFNULL( E.caijnum, 0 ) AS caijnum,
-            IFNULL( F.wcaijnum, 0 ) AS wcaijnum,
-            IFNULL( G.yicnum, 0 ) AS yicnum,
-            A.dept_id,
-            d.dept_name AS deptname,
-            j.dept_name AS jurname
+        IFNULL( A.num, 0 ) AS num,
+        IFNULL( B.cznum, 0 ) AS cznum,
+        IFNULL( C.paiqnum, 0 ) AS paiqnum,
+        IFNULL( D.wpaiqnum, 0 ) AS wpaiqnum,
+        IFNULL( E.caijnum, 0 ) AS caijnum,
+        IFNULL( F.wcaijnum, 0 ) AS wcaijnum,
+        IFNULL( G.yicnum, 0 ) AS yicnum,
+        A.dept_id,
+        d.dept_name AS deptname,
+        j.dept_name AS jurname
         FROM
-            ( SELECT COUNT( * ) AS num, dept_id, jurisdiction FROM blade_user WHERE role_id = '1412226235153731586' GROUP BY dept_id, jurisdiction ) A
-                LEFT JOIN (
-                SELECT
-                    COUNT( * ) AS cznum,
-                    dept_id,
-                    jurisdiction
-                FROM
-                    blade_user
-                WHERE
-                    role_id = '1412226235153731586'
-                  AND hold=0
-                GROUP BY
-                    dept_id,
-                    jurisdiction
-            ) B ON A.dept_id = B.dept_id
-                LEFT JOIN (
-                SELECT
-                    COUNT( * ) AS paiqnum,
-                    dept_id,
-                    jurisdiction
-                FROM
-                    blade_user
-                WHERE
-                    role_id = '1412226235153731586'
-                  AND dispatch=0
-                GROUP BY
-                    dept_id,
-                    jurisdiction
-            ) C ON C.dept_id = A.dept_id
-                LEFT JOIN (
-                SELECT
-                    COUNT( * ) AS wpaiqnum,
-                    dept_id,
-                    jurisdiction
-                FROM
-                    blade_user
-                WHERE
-                    role_id = '1412226235153731586'
-                  AND dispatch=1
-                GROUP BY
-                    dept_id,
-                    jurisdiction
-            ) D ON D.dept_id = A.dept_id
-                LEFT JOIN (
-                SELECT
-                    COUNT( * ) AS caijnum,
-                    dept_id,
-                    jurisdiction
-                FROM
-                    blade_user
-                WHERE
-                    role_id = '1412226235153731586'
-                  AND photo=0
-                GROUP BY
-                    dept_id,
-                    jurisdiction
-            ) E ON E.dept_id = A.dept_id
-                LEFT JOIN (
-                SELECT
-                    COUNT( * ) AS wcaijnum,
-                    dept_id,
-                    jurisdiction
-                FROM
-                    blade_user
-                WHERE
-                    role_id = '1412226235153731586'
-                  AND photo=1
-                GROUP BY
-                    dept_id,
-                    jurisdiction
-            ) F ON F.dept_id = A.dept_id
-                LEFT JOIN (
-                SELECT
-                    COUNT( * ) AS yicnum,
-                    dept_id,
-                    jurisdiction
-                FROM
-                    blade_user
-                WHERE
-                    role_id = '1412226235153731586'
-                  AND examination_mx=1
-                GROUP BY
-                    dept_id,
-                    jurisdiction
-            ) G ON G.dept_id = A.dept_id
-                LEFT JOIN blade_dept d ON A.dept_id = d.id
-                LEFT JOIN sys_jurisdiction j ON j.id = A.jurisdiction
+        ( SELECT COUNT( * ) AS num, dept_id, jurisdiction FROM blade_user WHERE role_id = '1412226235153731586' GROUP BY
+        dept_id, jurisdiction ) A
+        LEFT JOIN (
+        SELECT
+        COUNT( * ) AS cznum,
+        dept_id,
+        jurisdiction
+        FROM
+        blade_user
+        WHERE
+        role_id = '1412226235153731586'
+        AND hold=0
+        GROUP BY
+        dept_id,
+        jurisdiction
+        ) B ON A.dept_id = B.dept_id
+        LEFT JOIN (
+        SELECT
+        COUNT( * ) AS paiqnum,
+        dept_id,
+        jurisdiction
+        FROM
+        blade_user
+        WHERE
+        role_id = '1412226235153731586'
+        AND dispatch=0
+        GROUP BY
+        dept_id,
+        jurisdiction
+        ) C ON C.dept_id = A.dept_id
+        LEFT JOIN (
+        SELECT
+        COUNT( * ) AS wpaiqnum,
+        dept_id,
+        jurisdiction
+        FROM
+        blade_user
+        WHERE
+        role_id = '1412226235153731586'
+        AND dispatch=1
+        GROUP BY
+        dept_id,
+        jurisdiction
+        ) D ON D.dept_id = A.dept_id
+        LEFT JOIN (
+        SELECT
+        COUNT( * ) AS caijnum,
+        dept_id,
+        jurisdiction
+        FROM
+        blade_user
+        WHERE
+        role_id = '1412226235153731586'
+        AND photo=0
+        GROUP BY
+        dept_id,
+        jurisdiction
+        ) E ON E.dept_id = A.dept_id
+        LEFT JOIN (
+        SELECT
+        COUNT( * ) AS wcaijnum,
+        dept_id,
+        jurisdiction
+        FROM
+        blade_user
+        WHERE
+        role_id = '1412226235153731586'
+        AND photo=1
+        GROUP BY
+        dept_id,
+        jurisdiction
+        ) F ON F.dept_id = A.dept_id
+        LEFT JOIN (
+        SELECT
+        COUNT( * ) AS yicnum,
+        dept_id,
+        jurisdiction
+        FROM
+        blade_user
+        WHERE
+        role_id = '1412226235153731586'
+        AND examination_mx=1
+        GROUP BY
+        dept_id,
+        jurisdiction
+        ) G ON G.dept_id = A.dept_id
+        LEFT JOIN blade_dept d ON A.dept_id = d.id
+        LEFT JOIN sys_jurisdiction j ON j.id = A.jurisdiction
         WHERE 1=1
         <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
             and A.jurisdiction =#{jurisdiction}

--
Gitblit v1.9.3