From ccebbfd35eca5cd24eb3e32f7c1158e0596c471c Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 27 Jul 2021 15:34:53 +0800
Subject: [PATCH] 1.统计接口调整
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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..888ac84 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -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,12 @@
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>
</mapper>
--
Gitblit v1.9.3