From d39e15a3fb45f40e8bf0a52a73ded86158d6e0bd Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 17 Aug 2021 17:40:44 +0800
Subject: [PATCH] 1.统计接口调整
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 74 +++++++++++++++++++++++++++++++++++++
1 files changed, 74 insertions(+), 0 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 ab4bf2e..17940e8 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -330,6 +330,14 @@
Integer lnum = 0;
//这个月人数数量
Integer tnum = 0;
+ //上个月派遣人数
+ Integer tpznum = 0;
+ //这个月人数数量
+ Integer lpznum = 0;
+ //上个月总人数
+ Integer tznum = 0;
+ //这个月总人数
+ Integer lznum = 0;
//上个月金额
Double lmount = 0.0;
//这个月金额
@@ -350,11 +358,27 @@
String thisamounts = list.get(i).get("thisamount").toString();
Double thisamount = Double.parseDouble(thisamounts);
tmount += thisamount;
+ String userthismouth = list.get(i).get("userthismouth").toString();
+ Integer userthismouths = Integer.parseInt(userthismouth);
+ lpznum += userthismouths;
+ String userlastmouth = list.get(i).get("userlastmouth").toString();
+ Integer userlastmouths = Integer.parseInt(userlastmouth);
+ tpznum += userlastmouths;
+ String userpcthismouth = list.get(i).get("userpcthismouth").toString();
+ Integer userpcthismouths = Integer.parseInt(userpcthismouth);
+ lznum += userpcthismouths;
+ String userpclastmouth = list.get(i).get("userpclastmouth").toString();
+ Integer userpclastmouths = Integer.parseInt(userpclastmouth);
+ tznum += userpclastmouths;
}
map.put("lastmonth", lnum);
map.put("thismouth", tnum);
map.put("lastamount", lmount);
map.put("thisamount", tmount);
+ map.put("userlastmouth", tpznum);
+ map.put("userthismouth", lpznum);
+ map.put("userpcthismouth", lznum);
+ map.put("userpclastmouth", tznum);
lists.add(map);
return R.data(lists);
}
@@ -370,6 +394,20 @@
Calendar cal = Calendar.getInstance();
String year = String.valueOf(cal.get(Calendar.YEAR));
Map<String, String> map = informationService.queryYearSoil(year, jurisdiction, deptid);
+ map = (HashMap<String, String>) sortMapBykeyAsc(map);//key升序
+ return R.data(map);
+ }
+
+ /**
+ * 查询本年所有月份派遣人数
+ *
+ * @return
+ */
+ @GetMapping("/queryYearPz")
+ public R queryYearPz(String jurisdiction, String deptid) {
+ Calendar cal = Calendar.getInstance();
+ String year = String.valueOf(cal.get(Calendar.YEAR));
+ Map<String, String> map = informationService.queryYearPz(year, jurisdiction, deptid);
map = (HashMap<String, String>) sortMapBykeyAsc(map);//key升序
return R.data(map);
}
@@ -793,4 +831,40 @@
return R.data(list);
}
+ /**
+ * 公司运营情况进入图表
+ */
+ @PostMapping("/selectTb")
+ public R selectTb(String jurisdiction,String enterpriseName) {
+ List<Map<Object, Object>> list = informationService.selectTb(jurisdiction, enterpriseName);
+ return R.data(list);
+ }
+
+ /**
+ * 公司经济情况进入图表
+ */
+ @PostMapping("/selectJj")
+ public R selectJj(String jurisdiction,String enterpriseName) {
+ List<Map<Object, Object>> list = informationService.selectJj(jurisdiction, enterpriseName);
+ return R.data(list);
+ }
+
+ /**
+ * 业务统计情况
+ */
+ @PostMapping("/selectYw")
+ public R selectYw(String jurisdiction, String deptid) {
+ List<Map<Object, Object>> list = informationService.selectYw(jurisdiction, deptid);
+ return R.data(list);
+ }
+
+ /**
+ * 保安员详情
+ */
+ @PostMapping("/selectUIn")
+ public R selectUIn(String deptid,String name,String hold,String photo,String examinationtype,String dispatch,String soil) {
+ List<Map<Object, Object>> list = informationService.selectUIn(deptid, name, hold, photo, examinationtype, dispatch,soil);
+ return R.data(list);
+ }
+
}
--
Gitblit v1.9.3