From 3fcfb1de0f8ce7f35456d177e0e751453bdaaad8 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 16 Sep 2021 08:54:41 +0800
Subject: [PATCH] 1.社保
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 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 aff1e70..0833608 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -27,7 +27,7 @@
<result column="representativecell" property="representativecell"/>
<result column="contacts" property="contacts"/>
<result column="contactscell" property="contactscell"/>
- <result column="businessLicense" property="businessLicense"/>
+ <result column="business_License" property="businessLicense"/>
<result column="licence" property="licence"/>
<result column="znum" property="znum"/>
<result column="cnum" property="cnum"/>
@@ -79,7 +79,7 @@
<if test="information.stats!=null and information.stats!=''">
and i.stats=#{information.stats}
</if>
- <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1123598813738675201'">
+ <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1372091709474910209'">
and i.jurisdiction=#{information.jurisdiction}
</if>
<if test="information.departmentid!=null and information.departmentid!=''">
@@ -150,11 +150,11 @@
FROM
(
SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
- LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE u.examination_type = 0 GROUP BY u.dept_id
+ LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE u.examination_type = 0 and role_id = '1412226235153731586' AND `status` = 1 AND is_deleted = 0 GROUP BY u.dept_id
) A ON H.departmentid = A.dept_id
- LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE u.examination_type = 1 GROUP BY u.dept_id
+ LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE (u.examination_type = 1 or u.examination_type is null ) and role_id = '1412226235153731586' AND `status` = 1 AND is_deleted = 0 GROUP BY u.dept_id
) B ON H.departmentid = B.dept_id where 1=1
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and H.jurisdiction = #{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
@@ -167,7 +167,11 @@
<select id="selectHold" resultType="java.util.HashMap">
SELECT
IFNULL( A.thisnum, 0 ) AS cz,
- IFNULL( B.lastnum, 0 ) AS wcz
+ A.czname,
+ A.czptime,
+ IFNULL( B.lastnum, 0 ) AS wcz,
+ B.wczname,
+ B.wczptime
FROM
(
SELECT departmentid,jurisdiction FROM sys_information GROUP BY departmentid,jurisdiction
@@ -175,6 +179,8 @@
LEFT JOIN(
SELECT
COUNT( * ) AS thisnum,
+ group_concat(real_name) AS czname,
+ group_concat(IFNULL(paper_time,0)) AS czptime,
dept_id
FROM
blade_user
@@ -189,6 +195,8 @@
LEFT JOIN (
SELECT
COUNT(*) AS lastnum,
+ group_concat(real_name) AS wczname,
+ group_concat(IFNULL(paper_time,0)) AS wczptime,
dept_id
FROM
blade_user
@@ -204,7 +212,7 @@
<if test="deptid!=null and deptid!=''">
and H.departmentid = #{deptid}
</if>
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and H.jurisdiction = #{jurisdiction}
</if>
</select>
@@ -252,7 +260,7 @@
GROUP BY
dept_id
) B ON H.departmentid = B.dept_id where 1=1
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and H.jurisdiction = #{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
@@ -274,7 +282,7 @@
<if test="deptid!=null and deptid!=''">
and H.departmentid = #{deptid}
</if>
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and H.jurisdiction = #{jurisdiction}
</if>
</select>
@@ -290,7 +298,7 @@
on
si.departmentid = bd.id
where 1=1
- and bd.dept_category = 3
+ and si.stats = 1
<if test="information.deptName!=null and information.deptName!=''">
and bd.dept_name like concat(concat('%', #{information.deptName}),'%')
</if>
@@ -313,7 +321,7 @@
FROM
`sys_dispatcher_unit`
WHERE YEAR (end_time) >='2021'
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and jurisdiction =#{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
--
Gitblit v1.9.3