From b26fa47a83c05779eb686283f6bde81717ee00e4 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 29 Jul 2021 08:46:45 +0800
Subject: [PATCH] 1.统计接口调整
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 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..a38542b 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -45,17 +45,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 +64,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
@@ -164,9 +164,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 +172,7 @@
amount,
deptid
) A
- FULL JOIN (
+ left JOIN (
SELECT COUNT
(*) AS thismouth,
amount,
@@ -188,9 +186,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>
@@ -791,4 +787,15 @@
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>
</mapper>
--
Gitblit v1.9.3