From eaa5d67a66c81d05a323b0c6f814427a846bd077 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 19 Aug 2021 09:14:03 +0800
Subject: [PATCH] 1.统计接口调整

---
 src/main/java/org/springblade/modules/information/controller/InformationController.java |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 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 2f03d17..467499b 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -110,8 +110,8 @@
 	@ApiOperation(value = "新增", notes = "传入information")
 	public R save(@Valid @RequestBody Information information) {
 		Dept dept = new Dept();
-		String departmentid = information.getDepartmentid();
-		Long l = Long.parseLong(departmentid);
+		//String departmentid = information.getDepartmentid();
+		//Long l = Long.parseLong(departmentid);
 		//自招保安公司
 		if (information.getStats().equals("0")) {
 			Long i = 1420222768149966850L;
@@ -149,7 +149,7 @@
 			dept.setAncestors("0,1420222961377357825");
 			dept.setDeptCategory(1);
 		}
-		dept.setId(l);
+		//dept.setId(l);
 		if (iDeptService.submit(dept)) {
 			CacheUtil.clear(SYS_CACHE);
 			// 返回懒加载树更新节点所需字段
@@ -676,6 +676,7 @@
 
 	/**
 	 * 统计用户资格异常的数量
+	 *
 	 * @return
 	 */
 	@PostMapping("/selectExtypeUser")
@@ -801,8 +802,8 @@
 	 * 保安员统计
 	 */
 	@PostMapping("/selectLi")
-	public R selectLi(String jurisdiction, String deptid) {
-		List<Map<Object, Object>> list = informationService.selectLi(jurisdiction, deptid);
+	public R selectLi(String jurisdiction, String deptid,Integer current,Integer size) {
+		List<Map<Object, Object>> list = informationService.selectLi(jurisdiction, deptid,current,size);
 		return R.data(list);
 	}
 
@@ -835,8 +836,8 @@
 	 * 公司运营情况进入图表
 	 */
 	@PostMapping("/selectTb")
-	public R selectTb(String jurisdiction,String enterpriseName,Integer current,Integer size) {
-		List<Map<Object, Object>> list = informationService.selectTb(jurisdiction, enterpriseName,current,size);
+	public R selectTb(String jurisdiction, String enterpriseName, Integer current, Integer size) {
+		List<Map<Object, Object>> list = informationService.selectTb(jurisdiction, enterpriseName, current, size);
 		return R.data(list);
 	}
 
@@ -844,8 +845,8 @@
 	 * 公司经济情况进入图表
 	 */
 	@PostMapping("/selectJj")
-	public R selectJj(String jurisdiction,String enterpriseName,Integer current,Integer size) {
-		List<Map<Object, Object>> list = informationService.selectJj(jurisdiction, enterpriseName,current,size);
+	public R selectJj(String jurisdiction, String enterpriseName, Integer current, Integer size) {
+		List<Map<Object, Object>> list = informationService.selectJj(jurisdiction, enterpriseName, current, size);
 		return R.data(list);
 	}
 
@@ -853,8 +854,8 @@
 	 * 业务统计情况
 	 */
 	@PostMapping("/selectYw")
-	public R selectYw(String jurisdiction, String deptid) {
-		List<Map<Object, Object>> list = informationService.selectYw(jurisdiction, deptid);
+	public R selectYw(String jurisdiction, String deptid,Integer current,Integer size) {
+		List<Map<Object, Object>> list = informationService.selectYw(jurisdiction, deptid,current,size);
 		return R.data(list);
 	}
 
@@ -862,23 +863,23 @@
 	 * 保安员详情
 	 */
 	@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);
+	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);
 	}
 
 	/**
-	 * 	业务统计明细
+	 * 业务统计明细
 	 */
 	@PostMapping("/selectDis")
-	public R selectDis(String jurisdiction,String deptid,String fid,Integer current,Integer size) {
-		List<Map<Object, Object>> list = informationService.selectDis(jurisdiction,deptid,fid,current,size);
+	public R selectDis(String jurisdiction, String deptid, String fid, Integer current, Integer size) {
+		List<Map<Object, Object>> list = informationService.selectDis(jurisdiction, deptid, fid, current, size);
 		return R.data(list);
 	}
 
 
 	/**
-	 * 	服务单位下拉
+	 * 服务单位下拉
 	 */
 	@PostMapping("/selectFw")
 	public R selectFw() {

--
Gitblit v1.9.3