From 4ecf2dbe2c255c3b556ff4bfb49b4e2e8285bd17 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 31 Aug 2021 11:24:45 +0800
Subject: [PATCH] 1.ftp

---
 src/main/java/org/springblade/modules/information/controller/InformationController.java |   33 ++++++++++++++-------------------
 1 files changed, 14 insertions(+), 19 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 16a66c5..ac3a543 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -31,6 +31,7 @@
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.modules.dispatcher.vo.DispatcherVO;
+import org.springblade.modules.information.vo.InformationVO;
 import org.springblade.modules.jurisdiction.service.JurisdictionService;
 import org.springblade.modules.jurisdiction.vo.JurisdictionVO;
 import org.springblade.modules.system.entity.Dept;
@@ -97,8 +98,8 @@
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入information")
-	public R<IPage<Information>> page(Information information, Query query) {
-		IPage<Information> pages = informationService.selectInformationPage(Condition.getPage(query), information);
+	public R<IPage<InformationVO>> page(InformationVO information, Query query) {
+		IPage<InformationVO> pages = informationService.selectInformationPage(Condition.getPage(query), information);
 		return R.data(pages);
 	}
 
@@ -570,7 +571,7 @@
 		mapzc1.put("zc", mapzc);
 		lists.add(mapzc1);
 		//保安持证数量
-		Map<String, String> mapcz = informationService.queryYearZc(year, jurisdiction, deptid);
+		Map<String, String> mapcz = informationService.queryYearCz(year, jurisdiction, deptid);
 		mapcz = (HashMap<String, String>) sortMapBykeyAsc(mapcz);//key升序
 		mapcz1.put("chiz", mapcz);
 		lists.add(mapcz1);
@@ -802,8 +803,8 @@
 	 * 保安员统计
 	 */
 	@PostMapping("/selectLi")
-	public R<IPage> selectLi(String jurisdiction, String deptid, Query query) {
-		IPage list = informationService.selectLi(Condition.getPage(query), jurisdiction, deptid);
+	public R<IPage> selectLi(String jurisdiction, String deptid,String stats, Query query) {
+		IPage list = informationService.selectLi(Condition.getPage(query), jurisdiction, deptid,stats);
 		return R.data(list);
 	}
 
@@ -854,8 +855,8 @@
 	 * 业务统计情况
 	 */
 	@PostMapping("/selectYw")
-	public R<IPage> selectYw(String jurisdiction, String deptid, Query query) {
-		IPage list = informationService.selectYw(Condition.getPage(query), jurisdiction, deptid);
+	public R<IPage> selectYw(String jurisdiction, String deptid,String stats, Query query) {
+		IPage list = informationService.selectYw(Condition.getPage(query), jurisdiction, deptid,stats);
 		return R.data(list);
 	}
 
@@ -896,14 +897,8 @@
 		Integer count = 0;
 		List<Map<String, Object>> lists = new ArrayList<>();
 		List<Map<Object, Object>> maps = informationService.selectCf(jurisdiction);
-		for (int i = 0; i < maps.size(); i++) {
-			String num = maps.get(i).get("num").toString();
-			count += Integer.valueOf(num);
-		}
-		map.put("count", count);
-		map.put("list", maps);
-		lists.add(map);
-		return R.data(lists);
+		map.put("count", maps.size());
+		return R.data(map);
 	}
 
 	/**
@@ -971,14 +966,14 @@
 		Map map = new HashMap();
 		int count = 0;
 		for (int i = 0; i < list.size(); i++) {
-			String num = list.get(i).get("num").toString();
+			String num = list.get(i).get("fwnum").toString();
 			int a = Integer.parseInt(num);
 			if (a == 0) {
 				count++;
 				list1.add(list.get(i));
 			}
 		}
-		map.put("Count", count);
+		map.put("count", count);
 		map.put("List", list1);
 		return R.data(map);
 	}
@@ -993,14 +988,14 @@
 		Map map = new HashMap();
 		int count = 0;
 		for (int i = 0; i < list.size(); i++) {
-			String num = list.get(i).get("num").toString();
+			String num = list.get(i).get("znum").toString();
 			int a = Integer.parseInt(num);
 			if (a == 0) {
 				count++;
 				list1.add(list.get(i));
 			}
 		}
-		map.put("Count", count);
+		map.put("count", count);
 		map.put("List", list1);
 		return R.data(map);
 	}

--
Gitblit v1.9.3