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 | 195 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 158 insertions(+), 37 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 d54eb00..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>
@@ -45,17 +48,17 @@
<delete id="deleteIn">
delete
from sys_information
- where creditCode = #{creditcode}
+ where creditCode = #{ids}
</delete>
<delete id="deleteSh">
delete
from sys_shareholder
- where creditCode = #{creditcode}
+ where creditCode = #{ids}
</delete>
<delete id="deleteMe">
delete
from sys_member
- where creditCode = #{creditcode}
+ where creditCode = #{ids}
</delete>
<select id="selectCount" resultType="java.util.HashMap">
@@ -64,19 +67,19 @@
IFNULL(D.security, 0) AS security,
IFNULL(E.armed, 0) AS armed
FROM (SELECT jurisdiction FROM sys_information GROUP BY jurisdiction) A
- FULL JOIN (SELECT COUNT(stats) AS confess, jurisdiction
+ LEFT JOIN (SELECT COUNT(stats) AS confess, jurisdiction
FROM sys_information
WHERE stats = 0
GROUP BY jurisdiction) B ON A.jurisdiction = B.jurisdiction
- FULL JOIN (SELECT COUNT(stats) AS staff, jurisdiction
+ LEFT JOIN (SELECT COUNT(stats) AS staff, jurisdiction
FROM sys_information
WHERE stats = 1
GROUP BY jurisdiction) C ON A.jurisdiction = C.jurisdiction
- FULL JOIN (SELECT COUNT(stats) AS security, jurisdiction
+ LEFT JOIN (SELECT COUNT(stats) AS security, jurisdiction
FROM sys_information
WHERE stats = 2
GROUP BY jurisdiction) D ON A.jurisdiction = D.jurisdiction
- FULL JOIN (SELECT COUNT(stats) AS armed, jurisdiction
+ LEFT JOIN (SELECT COUNT(stats) AS armed, jurisdiction
FROM sys_information
WHERE stats = 3
GROUP BY jurisdiction) E ON A.jurisdiction = E.jurisdiction
@@ -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!=''">
@@ -127,17 +130,17 @@
left JOIN (
SELECT COUNT
(*) AS numz,
- deptid
- FROM sys_socil
- WHERE deptid IN (SELECT i.departmentid
+ dept_id
+ FROM blade_user
+ WHERE dept_id IN (SELECT i.departmentid
FROM sys_information i
LEFT JOIN sys_jurisdiction j ON j.id = i.jurisdiction where 1=1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
and i.jurisdiction =#{jurisdiction}
</if>
GROUP BY i.departmentid)
- GROUP BY deptid
- ) B ON A.deptid = B.deptid
+ GROUP BY dept_id
+ ) B ON A.deptid = B.dept_id
LEFT JOIN (SELECT id, dept_name FROM blade_dept) d ON d.id = A.deptid where 1=1
<if test="deptid!=null and deptid!=''">
and A.deptid =#{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
@@ -164,9 +167,7 @@
and i.jurisdiction =#{jurisdiction}
</if>
GROUP BY i.departmentid )
- AND datediff(month
- , insuredtime
- , getdate())=1
+ AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( insuredtime, '%Y%m' ) ) = 1
<if test="deptid!=null and deptid!=''">
and deptid =#{deptid}
</if>
@@ -174,7 +175,7 @@
amount,
deptid
) A
- FULL JOIN (
+ left JOIN (
SELECT COUNT
(*) AS thismouth,
amount,
@@ -188,9 +189,7 @@
and i.jurisdiction =#{jurisdiction}
</if>
GROUP BY i.departmentid )
- AND datediff(month
- , insuredtime
- , getdate())=0
+ AND DATE_FORMAT( insuredtime, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
<if test="deptid!=null and deptid!=''">
and deptid =#{deptid}
</if>
@@ -309,7 +308,7 @@
FROM
blade_user
WHERE
- role_id = '1413323482159321089'
+ role_id = '1412226235153731586'
AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
GROUP BY
dept_id,
@@ -323,7 +322,7 @@
FROM
blade_user
WHERE
- role_id = '1413323482159321089'
+ role_id = '1412226235153731586'
AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) = 1
GROUP BY
dept_id,
@@ -358,7 +357,7 @@
dept_id,
jurisdiction
FROM blade_user
- WHERE role_id = '1413323482159321089'
+ WHERE role_id = '1412226235153731586'
AND examination_type = 0
AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
GROUP BY dept_id,
@@ -370,7 +369,7 @@
dept_id,
jurisdiction
FROM blade_user
- WHERE role_id = '1413323482159321089'
+ WHERE role_id = '1412226235153731586'
AND examination_type = 0
AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) = 1
GROUP BY dept_id,
@@ -403,7 +402,7 @@
dept_id,
jurisdiction
FROM blade_user
- WHERE role_id = '1413323482159321089'
+ WHERE role_id = '1412226235153731586'
AND hold = 0
AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
GROUP BY dept_id,
@@ -415,7 +414,7 @@
dept_id,
jurisdiction
FROM blade_user
- WHERE role_id = '1413323482159321089'
+ WHERE role_id = '1412226235153731586'
AND hold = 0
AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) = 1
GROUP BY dept_id,
@@ -464,12 +463,12 @@
) 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>
<if test="deptid!=null and deptid!=''">
- and C.dept_id =#{deptid}
+ and C.deptid =#{deptid}
</if>
</select>
@@ -507,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>
@@ -544,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>
@@ -581,7 +580,7 @@
GROUP BY
i.departmentid
)
- AND role_id='1413323482159321089'
+ AND role_id='1412226235153731586'
<if test="deptid!=null and deptid!=''">
and dept_id =#{deptid}
</if>
@@ -613,7 +612,7 @@
GROUP BY
i.departmentid
)
- AND role_id='1413323482159321089' AND examination_type=0
+ AND role_id='1412226235153731586' AND examination_type=0
<if test="deptid!=null and deptid!=''">
and dept_id =#{deptid}
</if>
@@ -645,7 +644,7 @@
GROUP BY
i.departmentid
)
- AND role_id='1413323482159321089' AND hold=0
+ AND role_id='1412226235153731586' AND hold=0
<if test="deptid!=null and deptid!=''">
and dept_id =#{deptid}
</if>
@@ -711,7 +710,7 @@
GROUP BY
i.departmentid )
<if test="deptid!=null and deptid!=''">
- and deptid =#{deptid}
+ and dept_id =#{deptid}
</if>
</select>
@@ -725,7 +724,7 @@
FROM blade_user u
LEFT JOIN blade_dept d ON d.id = u.dept_id
LEFT JOIN sys_jurisdiction j ON j.id = u.jurisdiction
- WHERE u.examination_type = 2
+ WHERE u.examination_type = 1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
and u.jurisdiction =#{jurisdiction}
</if>
@@ -791,4 +790,126 @@
and u.dept_id =#{deptid}
</if>
</select>
+
+ <select id="selectIn" resultType="java.util.HashMap">
+ SELECT enterpriseName, departmentid
+ FROM sys_information where 1=1
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ and jurisdiction =#{jurisdiction}
+ </if>
+ </select>
+ <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