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 +++++++++++-------
src/main/java/org/springblade/modules/information/service/IInformationService.java | 1 +
src/main/java/org/springblade/modules/information/controller/InformationController.java | 9 +++++++++
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java | 1 +
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 5 +++++
5 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index aeb211b..8dfb514 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -681,4 +681,13 @@
lists.add(map);
return R.data(lists);
}
+
+ /**
+ * 单位列表
+ */
+ @PostMapping("/selectIn")
+ public R selectIn(String jurisdiction) {
+ List<Map<Object, Object>> maps = informationService.selectIn(jurisdiction);
+ return R.data(maps);
+ }
}
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
index f212a11..2e08a78 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -60,6 +60,7 @@
List<Map<Object,Object>> selectJur();
List<Map<Object,Object>> selectExtype(String jurisdiction,String deptid);
List<Map<Object,Object>> selectBx(String jurisdiction,String deptid);
+ List<Map<Object,Object>> selectIn(String jurisdiction);
Map<String, String> queryYearZ(String year,String jurisdiction,String deptid);
Map<String, String> queryYearZc(String year,String jurisdiction,String deptid);
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>
diff --git a/src/main/java/org/springblade/modules/information/service/IInformationService.java b/src/main/java/org/springblade/modules/information/service/IInformationService.java
index 07e44a4..818f103 100644
--- a/src/main/java/org/springblade/modules/information/service/IInformationService.java
+++ b/src/main/java/org/springblade/modules/information/service/IInformationService.java
@@ -67,4 +67,5 @@
Map<String, String> queryYearDe(String year,String jurisdiction,String deptid);
Map selectPcount(String jurisdiction,String deptid);
Map selectWPcount(String jurisdiction,String deptid);
+ List<Map<Object,Object>> selectIn(String jurisdiction);
}
diff --git a/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java b/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
index 6c22415..d1d9805 100644
--- a/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
@@ -170,5 +170,10 @@
return baseMapper.selectWPcount(jurisdiction, deptid);
}
+ @Override
+ public List<Map<Object, Object>> selectIn(String jurisdiction) {
+ return baseMapper.selectIn(jurisdiction);
+ }
+
}
--
Gitblit v1.9.3