From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改

---
 src/main/java/org/springblade/modules/information/controller/InformationController.java |  675 +++++++++++++++++++-------------------------------------
 1 files changed, 228 insertions(+), 447 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 7e56b0c..20d823a 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -32,6 +32,7 @@
 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.information.vo.ResponseVo;
 import org.springblade.modules.jurisdiction.service.JurisdictionService;
 import org.springblade.modules.jurisdiction.vo.JurisdictionVO;
 import org.springblade.modules.system.entity.Dept;
@@ -196,62 +197,6 @@
 		return R.success("删除成功");
 	}
 
-//	/**
-//	 * 首页保安公司统计接口
-//	 *
-//	 * @return
-//	 */
-//	@PostMapping("/SelectCount")
-//	public R SelectCount() {
-//		List<Map<Object, String>> list = iDeptService.selectCount();
-//		List<Map<String, Object>> lists = new ArrayList<>();
-//		for (int i = 0; i < list.size(); i++) {
-//			String title = list.get(i).get("title");//部门名称
-//			String departmentid = String.valueOf(list.get(i).get("jurisdiction"));//部门id
-//			Map<String, Object> map = new HashMap<String, Object>();
-//			Map maps = informationService.selectCount(departmentid);
-//			map.put("name", title);
-//			map.put("server", maps);
-//			lists.add(map);
-//		}
-//		return R.data(lists);
-//	}
-
-	/**
-	 * 首页保安持证统计接口
-	 *
-	 * @return
-	 *//*
-	@PostMapping("/SelectCounthold")
-	public R SelectCounthold() {
-		List<Map<Object, String>> list = iDeptService.selectCount();
-		List<Map<String, Object>> lists = new ArrayList<>();
-		for (int i = 0; i < list.size(); i++) {
-			int cznumber = 0;//总的持证数量
-			int wcznumber = 0;//总的未持证数量
-			String title = list.get(i).get("title");//部门名称
-			Map<String, Object> map = new HashMap<String, Object>();
-			Map<Object, Object> objectStringMap = iDeptService.selectHold(String.valueOf(list.get(i).get("jurisdiction")));
-			if (objectStringMap == null) {
-				map.put("name", title);
-				map.put("cz", cznumber);
-				map.put("wcz", wcznumber);
-				lists.add(map);
-			} else {
-				String cz = objectStringMap.get("cz").toString();
-				cznumber = Integer.valueOf(cz);
-				String wcz = objectStringMap.get("wcz").toString();
-				wcznumber = Integer.valueOf(wcz);
-				map.put("name", title);
-				map.put("cz", cznumber);
-				map.put("wcz", wcznumber);
-				lists.add(map);
-			}
-		}
-		return R.data(lists);
-	}*/
-
-
 	/**
 	 * 统计保安公司未持证的保安的公司数量
 	 */
@@ -331,18 +276,22 @@
 		Integer lnum = 0;
 		//这个月人数数量
 		Integer tnum = 0;
+		Integer znum = 0;
 		//上个月派遣人数
 		Integer tpznum = 0;
 		//这个月人数数量
 		Integer lpznum = 0;
+		Integer pznum = 0;
 		//上个月总人数
 		Integer tznum = 0;
 		//这个月总人数
 		Integer lznum = 0;
+		Integer sbnum = 0;
 		//上个月金额
 		Double lmount = 0.0;
 		//这个月金额
 		Double tmount = 0.0;
+		Double tamountnum = 0.0;
 		Map<String, Object> map = new HashMap<String, Object>();
 		List<Map<String, Object>> lists = new ArrayList<>();
 		List<Map<String, Object>> list = informationService.selectTo(jurisdiction, deptid);
@@ -353,33 +302,57 @@
 			String thismouths = list.get(i).get("thismouth").toString();
 			Integer thismouth = Integer.parseInt(thismouths);
 			tnum += thismouth;
+			//社保总数
+			String nums = list.get(i).get("num").toString();
+			Integer numss = Integer.parseInt(nums);
+			znum += numss;
+
 			String lastamounts = list.get(i).get("lastamount").toString();
 			Double lastamount = Double.parseDouble(lastamounts);
 			lmount += lastamount;
 			String thisamounts = list.get(i).get("thisamount").toString();
 			Double thisamount = Double.parseDouble(thisamounts);
 			tmount += thisamount;
+			//缴纳总数
+			String amountnums = list.get(i).get("amountnum").toString();
+			Double amountnumss = Double.parseDouble(amountnums);
+			tamountnum += amountnumss;
+
 			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 usernums = list.get(i).get("usernum").toString();
+			Integer usernumss = Integer.parseInt(usernums);
+			pznum += usernumss;
+			//公司派遣总数
 			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;
+			//缴纳社保总数
+			String userpcnums = list.get(i).get("userpcnum").toString();
+			Integer userpcnumss = Integer.parseInt(userpcnums);
+			sbnum += userpcnumss;
+
 		}
 		map.put("lastmonth", lnum);
 		map.put("thismouth", tnum);
+		map.put("znum", znum);
 		map.put("lastamount", lmount);
 		map.put("thisamount", tmount);
+		map.put("tamountnum", tamountnum);
 		map.put("userlastmouth", tpznum);
 		map.put("userthismouth", lpznum);
+		map.put("usernum", pznum);
 		map.put("userpcthismouth", lznum);
 		map.put("userpclastmouth", tznum);
+		map.put("userpcnum", sbnum);
 		lists.add(map);
 		return R.data(lists);
 	}
@@ -438,6 +411,12 @@
 		List<Map<String, Object>> lists = new ArrayList<>();
 		Integer a = 0;
 		Integer b = 0;
+		Integer num = 0;
+		Integer znum = 0;
+		Integer cznum = 0;
+		Integer sbnum = 0;
+		Integer khnum = 0;
+		Integer pqnum = 0;
 		Integer zca = 0;
 		Integer zcb = 0;
 		Integer cza = 0;
@@ -448,6 +427,7 @@
 		Integer khb = 0;
 		Integer pqa = 0;
 		Integer pqb = 0;
+		Integer integer = 0;
 		String deptname = null;
 		String jurname = null;
 		//保安员数量
@@ -466,10 +446,19 @@
 			//上个月数量
 			String lastnum = maps.get(i).get("lastnum").toString();
 			b += Integer.valueOf(lastnum);
-
+			String nums = maps.get(i).get("num").toString();
+			num += Integer.valueOf(nums);
+			String fznums = maps.get(i).get("fznum").toString();
+			integer += Integer.valueOf(fznums);
 		}
 		map.put("thisnum", a);
 		map.put("lastnum", b);
+		if(deptid.equals("")|| deptid.equals("null")){
+			map.put("num", num-integer);
+		}
+		else {
+			map.put("num", num);
+		}
 		map.put("List", maps);
 		mapC.put("baoan", map);
 		//正常保安员数量
@@ -481,9 +470,12 @@
 			//上个月数量
 			String lastnum = maps1.get(i).get("lastnum").toString();
 			zcb += Integer.valueOf(lastnum);
+			String nums = maps1.get(i).get("num").toString();
+			znum += Integer.valueOf(nums);
 		}
 		mapzc.put("thisnum", zca);
 		mapzc.put("lastnum", zcb);
+		mapzc.put("num", znum);
 		mapzc.put("List", maps1);
 		mapC.put("zcbaoan", mapzc);
 		//持证保安数量
@@ -495,9 +487,12 @@
 			//上个月数量
 			String lastnum = maps2.get(i).get("lastnum").toString();
 			czb += Integer.valueOf(lastnum);
+			String nums = maps2.get(i).get("num").toString();
+			cznum += Integer.valueOf(nums);
 		}
 		mapcz.put("thisnum", cza);
 		mapcz.put("lastnum", czb);
+		mapcz.put("num", cznum);
 		mapcz.put("List", maps2);
 		mapC.put("czbaoan", mapcz);
 		//缴纳社保数量
@@ -509,9 +504,12 @@
 			//上个月数量
 			String lastnum = maps3.get(i).get("lastnum").toString();
 			sbb += Integer.valueOf(lastnum);
+			String nums = maps3.get(i).get("num").toString();
+			sbnum += Integer.valueOf(nums);
 		}
 		mapsb.put("thisnum", sba);
 		mapsb.put("lastnum", sbb);
+		mapsb.put("num", sbnum);
 		mapsb.put("List", maps3);
 		mapC.put("sheb", mapsb);
 		//服务客户数量
@@ -523,9 +521,12 @@
 			//上个月数量
 			String lastnum = maps4.get(i).get("lastnum").toString();
 			khb += Integer.valueOf(lastnum);
+			String nums = maps4.get(i).get("num").toString();
+			khnum += Integer.valueOf(nums);
 		}
 		mapkh.put("thisnum", kha);
 		mapkh.put("lastnum", khb);
+		mapkh.put("num", khnum);
 		mapkh.put("List", maps4);
 		mapC.put("kh", mapkh);
 		//保安派遣数量
@@ -537,9 +538,12 @@
 			//上个月数量
 			String lastnum = maps5.get(i).get("lastnum").toString();
 			pqb += Integer.valueOf(lastnum);
+			String nums = maps5.get(i).get("num").toString();
+			pqnum += Integer.valueOf(nums);
 		}
 		mappq.put("thisnum", pqa);
 		mappq.put("lastnum", pqb);
+		mappq.put("num", pqnum);
 		mappq.put("List", maps5);
 		mapC.put("paiq", mappq);
 		lists.add(mapC);
@@ -650,31 +654,6 @@
 		return sortedMap;
 	}
 
-//
-//	/**
-//	 * 统计保安员资格异常的数量
-//	 *
-//	 * @param jurisdiction
-//	 * @param deptid
-//	 * @param type         1:当天  2:当月 3:全部
-//	 * @return
-//	 */
-//	@PostMapping("/selectExtype")
-//	public R selectExtype(String jurisdiction, String deptid, String type) {
-//		Map<String, Object> map = new HashMap<String, Object>();
-//		Integer count = 0;
-//		List<Map<String, Object>> lists = new ArrayList<>();
-//		List<Map<Object, Object>> maps = informationService.selectExtype(jurisdiction, deptid, type);
-//		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);
-//	}
-
 	/**
 	 * 统计用户资格异常的数量
 	 *
@@ -686,109 +665,6 @@
 	}
 
 
-	/**
-	 * 统计保安员表现差的数量
-	 *
-	 * @param jurisdiction
-	 * @param deptid
-	 * @param type         1:当天  2:当月 3:全部
-	 * @return
-	 *//*
-	@PostMapping("/selectBx")
-	public R selectBx(String jurisdiction, String deptid, String type) {
-		Map<String, Object> map = new HashMap<String, Object>();
-		Integer count = 0;
-		List<Map<String, Object>> lists = new ArrayList<>();
-		List<Map<Object, Object>> maps = informationService.selectBx(jurisdiction, deptid, type);
-		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);
-	}*/
-
-
-//	/**
-//	 * 分局预警统计
-//	 */
-//	@PostMapping("/selectFj")
-//	public R selectFj() {
-//		//辖区信息
-//		List<Map<Object, Object>> list = informationService.selectJur();
-//		List<Map<String, Object>> lists = new ArrayList<>();
-//		for (int i = 0; i < list.size(); i++) {
-//			Integer count = 0;
-//			Map<String, Object> map = new HashMap<String, Object>();
-//			//辖区id
-//			String jurisdiction = list.get(i).get("id").toString();
-//			//辖区名称
-//			String jurname = list.get(i).get("dept_name").toString();
-//			//保安员表现差预警数量
-//			List<Map<Object, Object>> mapbx = informationService.selectBx(jurisdiction, "", "");
-//			for (int ibx = 0; ibx < mapbx.size(); ibx++) {
-//				String num = mapbx.get(ibx).get("num").toString();
-//				count += Integer.valueOf(num);
-//			}
-//			//保安员资格异常的数量
-//			List<Map<Object, Object>> mapEx = informationService.selectExtype(jurisdiction, "", "");
-//			for (int iex = 0; iex < mapEx.size(); iex++) {
-//				String num = mapEx.get(iex).get("num").toString();
-//				count += Integer.valueOf(num);
-//			}
-//			//保安公司未持证数量
-//			List<Map<Object, String>> mapgs = informationService.selectInCount(jurisdiction, "");
-//			count += mapgs.size();
-//			//未缴社保数量
-//			List<Map<String, Object>> mapsb = informationService.selectCs(jurisdiction, "");
-//			for (int isb = 0; isb < mapsb.size(); isb++) {
-//				//交社保数
-//				String numjs = mapsb.get(isb).get("numj").toString();
-//				Integer numj = Integer.parseInt(numjs);
-//				//单位总人数
-//				String numzs = mapsb.get(isb).get("numz").toString();
-//				Integer numz = Integer.parseInt(numzs);
-//				//统计未交社保人数
-//				int i1 = numz - numj;
-//				count += i1;
-//			}
-//			map.put("Count", count);
-//			map.put("jurname", jurname);
-//			lists.add(map);
-//		}
-//		return R.data(lists);
-//	}
-
-
-//	/**
-//	 * 派遣數量統計
-//	 */
-//	@PostMapping("/selectPCount")
-//	public R selectPCount(String jurisdiction, String deptid) {
-//		Map<String, Object> map = new HashMap<String, Object>();
-//		List<Map<String, Object>> lists = new ArrayList<>();
-//		Map map1 = informationService.selectPcount(jurisdiction, deptid);
-//		String pnum = map1.get("pnum").toString();
-//		Integer a = Integer.valueOf(pnum);
-//		Map map2 = informationService.selectWPcount(jurisdiction, deptid);
-//		String wpnum = map2.get("wpnum").toString();
-//		Integer b = Integer.valueOf(wpnum);
-//		map.put("PCount", a);
-//		map.put("WPCount", b);
-//		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);
-//	}
 
 	/**
 	 * 单位删除
@@ -803,8 +679,8 @@
 	 * 保安员统计
 	 */
 	@PostMapping("/selectLi")
-	public R<IPage> selectLi(String jurisdiction, String deptid,String stats, Query query) {
-		IPage list = informationService.selectLi(Condition.getPage(query), jurisdiction, deptid,stats);
+	public R<IPage> selectLi(String jurisdiction, String deptid, String stats, String startTime, String endTime, Query query) {
+		IPage list = informationService.selectLi(Condition.getPage(query), jurisdiction, deptid, stats, startTime, endTime);
 		return R.data(list);
 	}
 
@@ -833,39 +709,12 @@
 		return R.data(list);
 	}
 
-//	/**
-//	 * 公司运营情况进入图表
-//	 */
-//	@PostMapping("/selectTb")
-//	public R<IPage> selectTb(String jurisdiction, String enterpriseName, Query query) {
-//		IPage list = informationService.selectTb(Condition.getPage(query), jurisdiction, enterpriseName);
-//		return R.data(list);
-//	}
-//
-//	/**
-//	 * 公司经济情况进入图表
-//	 */
-//	@PostMapping("/selectJj")
-//	public R<IPage> selectJj(String jurisdiction, String enterpriseName, Query query) {
-//		IPage list = informationService.selectJj(Condition.getPage(query), jurisdiction, enterpriseName);
-//		return R.data(list);
-//	}
-//
-//	/**
-//	 * 业务统计情况
-//	 */
-//	@PostMapping("/selectYw")
-//	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);
-//	}
-
 	/**
 	 * 保安员详情
 	 */
 	@PostMapping("/selectUIn")
-	public R<IPage> selectUIn(String deptid, String name, String hold, String photo, String examinationtype, String dispatch, String soil,Query query) {
-		IPage list = informationService.selectUIn(Condition.getPage(query),deptid, name, hold, photo, examinationtype, dispatch, soil);
+	public R<IPage> selectUIn(String deptid, String name, String hold, String photo, String examinationtype, String dispatch, String soil, Query query) {
+		IPage list = informationService.selectUIn(Condition.getPage(query), deptid, name, hold, photo, examinationtype, dispatch, soil);
 		return R.data(list);
 	}
 
@@ -888,19 +737,6 @@
 		return R.data(list);
 	}
 
-//	/**
-//	 * 公司处罚数量统计
-//	 */
-//	@PostMapping("/selectCf")
-//	public R selectCf(String jurisdiction) {
-//		Map<String, Object> map = new HashMap<String, Object>();
-//		Integer count = 0;
-//		List<Map<String, Object>> lists = new ArrayList<>();
-//		List<Map<Object, Object>> maps = informationService.selectCf(jurisdiction);
-//		map.put("count", maps.size());
-//		return R.data(map);
-//	}
-
 	/**
 	 * 公司材料不全数量统计
 	 */
@@ -920,86 +756,6 @@
 		return R.data(lists);
 	}
 
-//	/**
-//	 * 违规经营
-//	 */
-//	@PostMapping("/selectWg")
-//	public R selectWg(String jurisdiction) {
-//		List<Map<Object, Object>> list = informationService.selectWg(jurisdiction);
-//		List list1 = new ArrayList();
-//		int count=0;
-//		Map map = new HashMap();
-//		for (int i = 0; i < list.size(); i++) {
-//			//总数
-//			String znums = list.get(i).get("znum").toString();
-//			int znum = Integer.parseInt(znums);
-//			//持证人数
-//			String cznums = list.get(i).get("cznum").toString();
-//			int cznum = Integer.parseInt(cznums);
-//			//缴纳社保人数
-//			String sbnums = list.get(i).get("sbnum").toString();
-//			int sbnum = Integer.parseInt(sbnums);
-//			//保安总人数为0
-//			if (znum==0){
-//				continue;
-//			}
-//			else {
-//				int a = znum / 2;
-//				if (cznum<=a || sbnum<=a){
-//					count++;
-//					list1.add(list.get(i));
-//				}
-//			}
-//		}
-//		map.put("count",count);
-//		map.put("list",list1);
-//		return R.data(map);
-//	}
-
-//	/**
-//	 * 经营不善
-//	 */
-//	@PostMapping("/selectJy")
-//	public R selectJy(String jurisdiction) {
-//		List<Map<Object, Object>> list = informationService.selectJy(jurisdiction);
-//		List list1 = new ArrayList();
-//		Map map = new HashMap();
-//		int count = 0;
-//		for (int i = 0; i < list.size(); i++) {
-//			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("List", list1);
-//		return R.data(map);
-//	}
-
-//	/**
-//	 * 有实无名
-//	 */
-//	@PostMapping("/selectYs")
-//	public R selectYs(String jurisdiction) {
-//		List<Map<Object, Object>> list = informationService.selectYs(jurisdiction);
-//		List list1 = new ArrayList();
-//		Map map = new HashMap();
-//		int count = 0;
-//		for (int i = 0; i < list.size(); i++) {
-//			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("List", list1);
-//		return R.data(map);
-//	}
-
 	/**
 	 * @return
 	 */
@@ -1015,7 +771,7 @@
 			if (a <= 0) {
 				continue;
 			} else if (a >= 19 && a < 35) {
-				qcount ++;
+				qcount++;
 			} else if (a >= 36 && a < 59) {
 				zcount++;
 			} else {
@@ -1023,12 +779,11 @@
 			}
 		}
 		Map map = new HashMap();
-		map.put("qcount",qcount);
-		map.put("zcount",zcount);
-		map.put("lcount",lcount);
+		map.put("qcount", qcount);
+		map.put("zcount", zcount);
+		map.put("lcount", lcount);
 		return R.data(map);
 	}
-
 
 
 	/**
@@ -1041,7 +796,7 @@
 		//查出所有辖区
 		List<Map<Object, Object>> list = informationService.selJur();
 		List<Map<String, Object>> lists = new ArrayList<>();
-		for (int i = 0; i < list.size(); i++){
+		for (int i = 0; i < list.size(); i++) {
 			Map<String, Object> map = new HashMap<String, Object>();
 			Map<String, Object> mapc = new HashMap<String, Object>();
 			String id = list.get(i).get("id").toString();
@@ -1054,11 +809,11 @@
 			}
 			String substring = strArrays.substring(0, strArrays.length() - 1);
 			List<Map<Object, Object>> maps = informationService.seleJuList(substring);
-			mapc.put("confess",maps.get(0).get("num"));
-			mapc.put("staff",maps.get(1).get("num"));
-			mapc.put("security",maps.get(2).get("num"));
-			mapc.put("armed",maps.get(3).get("num"));
-			mapc.put("region",maps.get(4).get("num"));
+			mapc.put("confess", maps.get(0).get("num"));
+			mapc.put("staff", maps.get(1).get("num"));
+			mapc.put("security", maps.get(2).get("num"));
+			mapc.put("armed", maps.get(3).get("num"));
+			mapc.put("region", maps.get(4).get("num"));
 			map.put("name", list.get(i).get("deptname"));
 			map.put("server", mapc);
 			lists.add(map);
@@ -1066,62 +821,6 @@
 		return R.data(lists);
 	}
 
-	/**
-	 * 分局预警统计
-	 */
-	@PostMapping("/selectFj")
-	public R selectFj() {
-		//辖区信息
-		List<Map<Object, Object>> list = informationService.selectJur();
-		List<Map<String, Object>> lists = new ArrayList<>();
-		for (int i = 0; i < list.size(); i++) {
-			Integer count = 0;
-			Map<String, Object> map = new HashMap<String, Object>();
-			//辖区id
-			String id = list.get(i).get("id").toString();
-			//辖区名称
-			String jurname = list.get(i).get("dept_name").toString();
-			String childer = informationService.selJurchilder(id);
-			String[] split = childer.split(",");
-			String strArrays = "";
-			for (int j = 0; j < split.length; j++) {
-				strArrays += "'" + split[j] + "',";
-			}
-			String jurisdiction = strArrays.substring(0, strArrays.length() - 1);
-			//保安员表现差预警数量
-			List<Map<Object, Object>> mapbx = informationService.selectBx(jurisdiction, "", "");
-			for (int ibx = 0; ibx < mapbx.size(); ibx++) {
-				String num = mapbx.get(ibx).get("num").toString();
-				count += Integer.valueOf(num);
-			}
-			//保安员资格异常的数量
-			List<Map<Object, Object>> mapEx = informationService.selectExtype(jurisdiction, "", "");
-			for (int iex = 0; iex < mapEx.size(); iex++) {
-				String num = mapEx.get(iex).get("num").toString();
-				count += Integer.valueOf(num);
-			}
-			//保安公司未持证数量
-			List<Map<Object, String>> mapgs = informationService.selectInCount(jurisdiction, "");
-			count += mapgs.size();
-			//未缴社保数量
-			List<Map<String, Object>> mapsb = informationService.selectCs(jurisdiction, "");
-			for (int isb = 0; isb < mapsb.size(); isb++) {
-				//交社保数
-				String numjs = mapsb.get(isb).get("numj").toString();
-				Integer numj = Integer.parseInt(numjs);
-//				//单位总人数
-//				String numzs = mapsb.get(isb).get("numz").toString();
-//				Integer numz = Integer.parseInt(numzs);
-//				//统计未交社保人数
-//				int i1 = numz - numj;
-				count += numj;
-			}
-			map.put("Count", count);
-			map.put("jurname", jurname);
-			lists.add(map);
-		}
-		return R.data(lists);
-	}
 
 	/**
 	 * 首页保安持证统计接口
@@ -1146,19 +845,19 @@
 			String deptid = strArrays.substring(0, strArrays.length() - 1);
 			Map<String, Object> map = new HashMap<String, Object>();
 			List<Map<String, Object>> objectStringMap = iDeptService.selectHold(deptid);
-			if (objectStringMap.size()==0) {
+			if (objectStringMap.size() == 0) {
 				map.put("name", list.get(i).get("deptname"));
 				map.put("cz", cznumber);
 				map.put("wcz", wcznumber);
 				lists.add(map);
 			} else {
-				for (int c=0;c<objectStringMap.size();c++){
+				for (int c = 0; c < objectStringMap.size(); c++) {
 					String cz = objectStringMap.get(c).get("cz").toString();
 					cznumber += Integer.valueOf(cz);
 					String wcz = objectStringMap.get(c).get("wcz").toString();
 					wcznumber += Integer.valueOf(wcz);
 				}
-				map.put("name",  list.get(i).get("deptname"));
+				map.put("name", list.get(i).get("deptname"));
 				map.put("cz", cznumber);
 				map.put("wcz", wcznumber);
 				lists.add(map);
@@ -1181,7 +880,7 @@
 		Map<String, Object> map = new HashMap<String, Object>();
 		Integer count = 0;
 		List<Map<String, Object>> lists = new ArrayList<>();
-		if (jurisdiction.equals("1372091709474910209") || "".equals(jurisdiction)){
+		if (jurisdiction.equals("1372091709474910209") || "".equals(jurisdiction)) {
 			List<Map<Object, Object>> maps = informationService.selectBx(jurisdiction, deptid, type);
 			for (int i = 0; i < maps.size(); i++) {
 				String num = maps.get(i).get("num").toString();
@@ -1190,16 +889,15 @@
 			map.put("count", count);
 			map.put("list", maps);
 			lists.add(map);
-		}
-		else {
-			String childer = informationService.selJurchilder(jurisdiction);
-			String[] split = childer.split(",");
-			String strArrays = "";
-			for (int j = 0; j < split.length; j++) {
-				strArrays += "'" + split[j] + "',";
-			}
-			String jurisdictiond = strArrays.substring(0, strArrays.length() - 1);
-			List<Map<Object, Object>> maps = informationService.selectBx(jurisdictiond, deptid, type);
+		} else {
+//			String childer = informationService.selJurchilder(jurisdiction);
+//			String[] split = childer.split(",");
+//			String strArrays = "";
+//			for (int j = 0; j < split.length; j++) {
+//				strArrays += "'" + split[j] + "',";
+//			}
+//			String jurisdictiond = strArrays.substring(0, strArrays.length() - 1);
+			List<Map<Object, Object>> maps = informationService.selectBx(jurisdiction, deptid, type);
 			for (int i = 0; i < maps.size(); i++) {
 				String num = maps.get(i).get("num").toString();
 				count += Integer.valueOf(num);
@@ -1211,7 +909,6 @@
 
 		return R.data(lists);
 	}
-
 
 
 	/**
@@ -1236,8 +933,7 @@
 			map.put("count", count);
 			map.put("list", maps);
 			lists.add(map);
-		}
-		else {
+		} else {
 			String childer = informationService.selJurchilder(jurisdiction);
 			String[] split = childer.split(",");
 			String strArrays = "";
@@ -1263,10 +959,10 @@
 	 */
 	@PostMapping("/selectWg")
 	public R selectWg(String jurisdiction) {
-		if (jurisdiction.equals("1372091709474910209")){
+		if (jurisdiction.equals("1372091709474910209") || jurisdiction.equals("") ) {
 			List<Map<Object, Object>> list = informationService.selectWg(jurisdiction);
 			List list1 = new ArrayList();
-			int count=0;
+			int count = 0;
 			Map map = new HashMap();
 			for (int i = 0; i < list.size(); i++) {
 				//总数
@@ -1279,22 +975,20 @@
 				String sbnums = list.get(i).get("sbnum").toString();
 				int sbnum = Integer.parseInt(sbnums);
 				//保安总人数为0
-				if (znum==0){
+				if (znum == 0) {
 					continue;
-				}
-				else {
+				} else {
 					int a = znum / 2;
-					if (cznum<=a || sbnum<=a){
+					if (cznum <= a || sbnum <= a) {
 						count++;
 						list1.add(list.get(i));
 					}
 				}
 			}
-			map.put("count",count);
-			map.put("list",list1);
+			map.put("count", count);
+			map.put("list", list1);
 			return R.data(map);
-		}
-		else {
+		} else {
 			String childer = informationService.selJurchilder(jurisdiction);
 			String[] split = childer.split(",");
 			String strArrays = "";
@@ -1304,7 +998,7 @@
 			String jurisdictiond = strArrays.substring(0, strArrays.length() - 1);
 			List<Map<Object, Object>> list = informationService.selectWg(jurisdictiond);
 			List list1 = new ArrayList();
-			int count=0;
+			int count = 0;
 			Map map = new HashMap();
 			for (int i = 0; i < list.size(); i++) {
 				//总数
@@ -1317,19 +1011,18 @@
 				String sbnums = list.get(i).get("sbnum").toString();
 				int sbnum = Integer.parseInt(sbnums);
 				//保安总人数为0
-				if (znum==0){
+				if (znum == 0) {
 					continue;
-				}
-				else {
+				} else {
 					int a = znum / 2;
-					if (cznum<=a || sbnum<=a){
+					if (cznum <= a || sbnum <= a) {
 						count++;
 						list1.add(list.get(i));
 					}
 				}
 			}
-			map.put("count",count);
-			map.put("list",list1);
+			map.put("count", count);
+			map.put("list", list1);
 			return R.data(map);
 		}
 
@@ -1341,7 +1034,7 @@
 	 */
 	@PostMapping("/selectJy")
 	public R selectJy(String jurisdiction) {
-		if (jurisdiction.equals("1372091709474910209")){
+		if (jurisdiction.equals("1372091709474910209")) {
 			List<Map<Object, Object>> list = informationService.selectJy(jurisdiction);
 			List list1 = new ArrayList();
 			Map map = new HashMap();
@@ -1357,8 +1050,7 @@
 			map.put("count", count);
 			map.put("List", list1);
 			return R.data(map);
-		}
-		else {
+		} else {
 			String childer = informationService.selJurchilder(jurisdiction);
 			String[] split = childer.split(",");
 			String strArrays = "";
@@ -1407,8 +1099,7 @@
 			map.put("count", count);
 			map.put("List", list1);
 			return R.data(map);
-		}
-		else {
+		} else {
 			String childer = informationService.selJurchilder(jurisdiction);
 			String[] split = childer.split(",");
 			String strArrays = "";
@@ -1446,8 +1137,7 @@
 			List<Map<Object, Object>> maps = informationService.selectCf(jurisdiction);
 			map.put("count", maps.size());
 			return R.data(map);
-		}
-		else {
+		} else {
 			String childer = informationService.selJurchilder(jurisdiction);
 			String[] split = childer.split(",");
 			String strArrays = "";
@@ -1467,11 +1157,10 @@
 	 */
 	@PostMapping("/selectIn")
 	public R selectIn(String jurisdiction) {
-		if (jurisdiction.equals("1372091709474910209")|| "".equals(jurisdiction)) {
+		if (jurisdiction.equals("1372091709474910209") || "".equals(jurisdiction)) {
 			List<Map<Object, Object>> maps = informationService.selectIn(jurisdiction);
 			return R.data(maps);
-		}
-		else {
+		} else {
 			String childer = informationService.selJurchilder(jurisdiction);
 			String[] split = childer.split(",");
 			String strArrays = "";
@@ -1489,11 +1178,10 @@
 	 */
 	@PostMapping("/selectTb")
 	public R<IPage> selectTb(String jurisdiction, String enterpriseName, Query query) {
-		if (jurisdiction.equals("1372091709474910209") || "".equals(jurisdiction)){
+		if (jurisdiction.equals("1372091709474910209") || "".equals(jurisdiction)) {
 			IPage list = informationService.selectTb(Condition.getPage(query), jurisdiction, enterpriseName);
 			return R.data(list);
-		}
-		else {
+		} else {
 			String childer = informationService.selJurchilder(jurisdiction);
 			String[] split = childer.split(",");
 			String strArrays = "";
@@ -1512,11 +1200,10 @@
 	 */
 	@PostMapping("/selectJj")
 	public R<IPage> selectJj(String jurisdiction, String enterpriseName, Query query) {
-		if (jurisdiction.equals("1372091709474910209")|| "".equals(jurisdiction)) {
+		if (jurisdiction.equals("1372091709474910209") || "".equals(jurisdiction)) {
 			IPage list = informationService.selectJj(Condition.getPage(query), jurisdiction, enterpriseName);
 			return R.data(list);
-		}
-		else {
+		} else {
 			String childer = informationService.selJurchilder(jurisdiction);
 			String[] split = childer.split(",");
 			String strArrays = "";
@@ -1533,20 +1220,19 @@
 	 * 业务统计情况
 	 */
 	@PostMapping("/selectYw")
-	public R<IPage> selectYw(String jurisdiction, String deptid,String stats, Query query) {
-		if (jurisdiction.equals("1372091709474910209")|| "".equals(jurisdiction)) {
-			IPage list = informationService.selectYw(Condition.getPage(query), jurisdiction, deptid, stats);
+	public R<IPage> selectYw(String jurisdiction, String deptid, String stats, String startTime, String endTime, Query query) {
+		if (jurisdiction.equals("1372091709474910209") || "".equals(jurisdiction)) {
+			IPage list = informationService.selectYw(Condition.getPage(query), jurisdiction, deptid, stats, startTime, endTime);
 			return R.data(list);
-		}
-		else {
-			String childer = informationService.selJurchilder(jurisdiction);
-			String[] split = childer.split(",");
-			String strArrays = "";
-			for (int j = 0; j < split.length; j++) {
-				strArrays += "'" + split[j] + "',";
-			}
-			String jurisdictiond = strArrays.substring(0, strArrays.length() - 1);
-			IPage list = informationService.selectYw(Condition.getPage(query), jurisdictiond, deptid, stats);
+		} else {
+//			String childer = informationService.selJurchilder(jurisdiction);
+//			String[] split = childer.split(",");
+//			String strArrays = "";
+//			for (int j = 0; j < split.length; j++) {
+//				strArrays += "'" + split[j] + "',";
+//			}
+//			String jurisdictiond = strArrays.substring(0, strArrays.length() - 1);
+			IPage list = informationService.selectYw(Condition.getPage(query), jurisdiction, deptid, stats, startTime, endTime);
 			return R.data(list);
 		}
 	}
@@ -1555,12 +1241,12 @@
 	public R selectPCount(String jurisdiction, String deptid) {
 		Map<String, Object> map = new HashMap<String, Object>();
 		List<Map<String, Object>> lists = new ArrayList<>();
-		String childer = informationService.selJurchilder(jurisdiction);
-		String[] split = childer.split(",");
-		String strArrays = "";
-		for (int j = 0; j < split.length; j++) {
-			strArrays += "'" + split[j] + "',";
-		}
+//		String childer = informationService.selJurchilder(jurisdiction);
+//		String[] split = childer.split(",");
+//		String strArrays = "";
+//		for (int j = 0; j < split.length; j++) {
+//			strArrays += "'" + split[j] + "',";
+//		}
 		Integer pnums = 0;
 		Integer wpnums = 0;
 		if (jurisdiction.equals("1372091709474910209") || "".equals(jurisdiction)) {
@@ -1574,8 +1260,8 @@
 				wpnums += b;
 			}
 		} else {
-			String jurisdictiond = strArrays.substring(0, strArrays.length() - 1);
-			List<Map<String, Object>> list = informationService.seleP(jurisdictiond, deptid);
+			//String jurisdictiond = strArrays.substring(0, strArrays.length() - 1);
+			List<Map<String, Object>> list = informationService.seleP(jurisdiction, deptid);
 			for (int i = 0; i < list.size(); i++) {
 				String pnum = list.get(i).get("pnum").toString();
 				Integer a = Integer.parseInt(pnum);
@@ -1597,4 +1283,99 @@
 		return R.data(lists);
 	}
 
+	/**
+	 * 分局预警统计
+	 */
+	@PostMapping("/selectFj")
+	public R selectFj() {
+		//辖区信息
+		List<Map<Object, Object>> list = informationService.selectJur();
+		List<Map<String, Object>> lists = new ArrayList<>();
+		for (int i = 0; i < list.size(); i++) {
+			Integer count = 0;
+			int countwg = 0;
+			int countjy = 0;
+			int countwm = 0;
+			Map<String, Object> map = new HashMap<String, Object>();
+			//辖区id
+			String id = list.get(i).get("id").toString();
+			//辖区名称
+			String jurname = list.get(i).get("dept_name").toString();
+			String childer = informationService.selJurchilder(id);
+			String[] split = childer.split(",");
+			String strArrays = "";
+			for (int j = 0; j < split.length; j++) {
+				strArrays += "'" + split[j] + "',";
+			}
+			String jurisdiction = strArrays.substring(0, strArrays.length() - 1);
+			//保安员表现差预警数量
+			List<Map<Object, Object>> mapbx = informationService.selectBx(jurisdiction, "", "");
+			for (int ibx = 0; ibx < mapbx.size(); ibx++) {
+				String num = mapbx.get(ibx).get("num").toString();
+				count += Integer.valueOf(num);
+			}
+			//保安员资格异常的数量
+			List<Map<Object, Object>> mapEx = informationService.selectExtype(jurisdiction, "", "");
+			for (int iex = 0; iex < mapEx.size(); iex++) {
+				String num = mapEx.get(iex).get("num").toString();
+				count += Integer.valueOf(num);
+			}
+			List<Map<Object, Object>> maps = informationService.seleFj(jurisdiction);
+			for (int z = 0; z < maps.size(); z++) {
+				//违规经营
+				//总数
+				String znums = maps.get(z).get("znum").toString();
+				int znum = Integer.parseInt(znums);
+				//持证人数
+				String cznums = maps.get(z).get("cznum").toString();
+				int cznum = Integer.parseInt(cznums);
+				//缴纳社保人数
+				String sbnums = maps.get(z).get("sbnum").toString();
+				int sbnum = Integer.parseInt(sbnums);
+				//保安总人数为0
+				if (znum == 0) {
+				} else {
+					int a = znum / 2;
+					if (cznum <= a || sbnum <= a) {
+						countwg++;
+					}
+				}
+				//经营不善
+				String num = maps.get(z).get("fwnum").toString();
+				int a = Integer.parseInt(num);
+				if (a == 0) {
+					countjy++;
+				}
+				//有实无名
+				String numw = maps.get(z).get("znum").toString();
+				int aw = Integer.parseInt(numw);
+				if (aw == 0) {
+					countwm++;
+				}
+			}
+			//处罚
+			List<Map<Object, Object>> mapc = informationService.selectCf(jurisdiction);
+			int size = mapc.size();
+			map.put("Count", count + countjy + countwg + countwm + size);
+			map.put("jurname", jurname);
+			lists.add(map);
+		}
+		return R.data(lists);
+	}
+
+	@PostMapping("/selectBxc")
+	public R<IPage> selectBxc(String jurisdiction,String type,Query query) {
+		IPage maps = informationService.selectBxc(Condition.getPage(query), jurisdiction,type);
+		return R.data(maps);
+	}
+
+	/**
+	 * 获取部门信息()
+	 * @param information
+	 * @return
+	 */
+	@GetMapping("/getInformationDetails")
+	public R getInformationDetails(InformationVO information) {
+		return R.data(informationService.getInformationDetails(information));
+	}
 }

--
Gitblit v1.9.3