From 03f42f3e256dbc2e0c4e9b7ce3cb6a85df7cf130 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 27 Aug 2021 20:40:40 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 insertions(+), 4 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 96104dd..28d0e51 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -276,8 +276,8 @@
* 统计保安员资格异常的数量
*/
@PostMapping("/selectExtype")
- public R selectExtype(String deptid) {
- List<Map<Object, Object>> lists = informationService.selectExtype(deptid);
+ public R selectExtype(String deptid,String jurisdiction) {
+ List<Map<Object, Object>> lists = informationService.selectExtype(deptid,jurisdiction);
return R.data(lists);
}
@@ -285,8 +285,8 @@
* 统计保安员持证的数量
*/
@PostMapping("/selectHold")
- public R selectHold(String deptid) {
- List<Map<Object, Object>> lists = informationService.selectHold(deptid);
+ public R selectHold(String deptid,String jurisdiction) {
+ List<Map<Object, Object>> lists = informationService.selectHold(deptid,jurisdiction);
return R.data(lists);
}
@@ -341,5 +341,50 @@
return R.success("操作成功");
}
+ /**
+ * 查询本年所有月份的客户数量
+ *
+ * @return
+ */
+ @GetMapping("/queryYearKh")
+ public R 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);
+ }
+ //升序
+ public static Map<String, String> sortMapBykeyAsc(Map<String, String> oriMap) {
+ Map<String, String> sortedMap = new LinkedHashMap<String, String>();
+ try {
+ if (oriMap != null && !oriMap.isEmpty()) {
+ List<Map.Entry<String, String>> entryList = new ArrayList<Map.Entry<String, String>>(oriMap.entrySet());
+ Collections.sort(entryList,
+ new Comparator<Map.Entry<String, String>>() {
+ public int compare(Map.Entry<String, String> entry2,
+ Map.Entry<String, String> entry1) {
+ int value2 = 0, value1 = 0;
+ try {
+ value2 = Integer.parseInt(entry1.getKey());
+ value1 = Integer.parseInt(entry2.getKey());
+ } catch (NumberFormatException e) {
+ value2 = 0;
+ value1 = 0;
+ }
+ return value1 - value2;
+ }
+ });
+ Iterator<Map.Entry<String, String>> iter = entryList.iterator();
+ Map.Entry<String, String> tmpEntry = null;
+ while (iter.hasNext()) {
+ tmpEntry = iter.next();
+ sortedMap.put(tmpEntry.getKey(), tmpEntry.getValue());
+ }
+ }
+ } catch (Exception e) {
+ }
+ return sortedMap;
+ }
}
--
Gitblit v1.9.3