From c0a78b608d90f13fc34018c8d88ddf5c44acdbd7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 12 Aug 2021 10:17:09 +0800
Subject: [PATCH] 1.数据源修改 2.单位添加字段

---
 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml |  126 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 120 insertions(+), 6 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 a90ce6d..8bdbc51 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -23,6 +23,9 @@
         <result column="departmentid" property="departmentid"/>
         <result column="stats" property="stats"/>
         <result column="jurisdiction" property="jurisdiction"/>
+        <result column="representativecell" property="representativecell"/>
+        <result column="contacts" property="contacts"/>
+        <result column="contactscell" property="contactscell"/>
     </resultMap>
 
 
@@ -94,7 +97,7 @@
         LEFT JOIN sys_jurisdiction j ON j.id= u.jurisdiction
         WHERE
         hold = 1
-        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+        <if test="jurisdiction!=null and jurisdiction!=''">
             and u.jurisdiction =#{jurisdiction}
         </if>
         <if test="deptid!=null and deptid!=''">
@@ -149,9 +152,9 @@
         SELECT IFNULL(A.lastmonth, 0) AS lastmonth,
         IFNULL(B.thismouth, 0) AS thismouth,
         IFNULL(A.amount, 0) AS lastamount,
-        IFNULL(b.amount, 0) AS thisamount
+        IFNULL(B.amount, 0) AS thisamount
         FROM (
-        SELECT COUNT
+        SELECT COUNTb.
         (*) AS lastmonth,
         amount,
         deptid
@@ -460,7 +463,7 @@
         ) B ON A.deptid = B.deptid
         ) C
         LEFT JOIN blade_dept d ON C.deptid = d.id
-        LEFT JOIN sys_jurisdiction j ON j.id = c.jurisdiction where 1=1
+        LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction where 1=1
         <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
             and C.jurisdiction =#{jurisdiction}
         </if>
@@ -503,7 +506,7 @@
         ) B ON A.dept_id = B.dept_id
         ) C
         LEFT JOIN blade_dept d ON C.dept_id = d.id
-        LEFT JOIN sys_jurisdiction j ON j.id = c.jurisdiction WHERE 1=1
+        LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction WHERE 1=1
         <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
             and C.jurisdiction =#{jurisdiction}
         </if>
@@ -540,7 +543,7 @@
         GROUP BY dept_id, jurisdiction
         ) B ON A.dept_id = B.dept_id) C
         LEFT JOIN blade_dept d ON C.dept_id = d.id
-        LEFT JOIN sys_jurisdiction j ON j.id = c.jurisdiction where 1=1
+        LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction where 1=1
         <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
             and C.jurisdiction =#{jurisdiction}
         </if>
@@ -798,4 +801,115 @@
     <delete id="deleteDept">
         delete from  blade_dept where id=#{ids}
     </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
+        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
+        WHERE 1=1
+        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+            and A.jurisdiction =#{jurisdiction}
+        </if>
+        <if test="deptid!=null and deptid!=''">
+            and A.dept_id =#{deptid}
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.9.3