From 8e133cdb1da27aea20ec0286e63fcf77d02eade7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 28 Aug 2021 16:31:10 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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 28d0e51..a564b5c 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -303,8 +303,8 @@
* 保安派遣数量统计
*/
@PostMapping("/selectDisp")
- public R selectDisp(String deptid) {
- List<Map<Object, Object>> lists = informationService.selectDisp(deptid);
+ public R selectDisp(String deptid,String jurisdiction) {
+ List<Map<Object, Object>> lists = informationService.selectDisp(deptid,jurisdiction);
return R.data(lists);
}
@@ -312,8 +312,8 @@
* 社保统计
*/
@PostMapping("/selectSoil")
- public R selectSoil(String deptid) {
- List<Map<Object, Object>> lists = informationService.selectSoil(deptid);
+ public R selectSoil(String deptid,String jurisdiction) {
+ List<Map<Object, Object>> lists = informationService.selectSoil(deptid,jurisdiction);
List<Map<String, Object>> list = new ArrayList<>();
for (int i = 0; i < lists.size(); i++) {
Map<String, Object> map = new HashMap<String, Object>();
@@ -346,13 +346,12 @@
*
* @return
*/
- @GetMapping("/queryYearKh")
- public R queryYearKh(String jurisdiction, String deptid) {
+ @PostMapping("/queryYearKh")
+ public List queryYearKh(String jurisdiction, String deptid) {
Calendar cal = Calendar.getInstance();
String year = String.valueOf(cal.get(Calendar.YEAR));
- Map<String, String> map = informationService.queryYearKh(year, jurisdiction, deptid);
- map = (HashMap<String, String>) sortMapBykeyAsc(map);//key升序
- return R.data(map);
+ List list = informationService.queryYearKh(year, jurisdiction, deptid);
+ return list;
}
//升序
public static Map<String, String> sortMapBykeyAsc(Map<String, String> oriMap) {
--
Gitblit v1.9.3