From 6234ef30e315d6518401926c2eae0267c4742dfd Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 23 Aug 2021 10:55:35 +0800
Subject: [PATCH] 1.首页接口调整

---
 src/main/java/org/springblade/modules/information/controller/InformationController.java |   68 +++++++++++++++++++++++++---------
 1 files changed, 50 insertions(+), 18 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 467499b..7b57840 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -29,24 +29,23 @@
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.support.Kv;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.desk.entity.Notice;
-import org.springblade.modules.desk.vo.NoticeVO;
-import org.springblade.modules.desk.wrapper.NoticeWrapper;
+import org.springblade.modules.dispatcher.vo.DispatcherVO;
 import org.springblade.modules.jurisdiction.service.JurisdictionService;
 import org.springblade.modules.jurisdiction.vo.JurisdictionVO;
-import org.springblade.modules.member.service.IMemberService;
-import org.springblade.modules.shareholder.service.IShareholderService;
 import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.service.IDeptService;
-import org.springblade.modules.system.service.IUserDeptService;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.modules.information.entity.Information;
-import org.springblade.modules.information.vo.InformationVO;
 import org.springblade.modules.information.service.IInformationService;
 import org.springblade.core.boot.ctrl.BladeController;
 import springfox.documentation.annotations.ApiIgnore;
+
+import java.text.DecimalFormat;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
 
 import java.util.*;
 
@@ -802,8 +801,8 @@
 	 * 保安员统计
 	 */
 	@PostMapping("/selectLi")
-	public R selectLi(String jurisdiction, String deptid,Integer current,Integer size) {
-		List<Map<Object, Object>> list = informationService.selectLi(jurisdiction, deptid,current,size);
+	public R<IPage> selectLi(String jurisdiction, String deptid, Query query) {
+		IPage list = informationService.selectLi(Condition.getPage(query),jurisdiction, deptid);
 		return R.data(list);
 	}
 
@@ -836,8 +835,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<IPage> selectTb(String jurisdiction, String enterpriseName, Query query) {
+		IPage list =informationService.selectTb(Condition.getPage(query),jurisdiction, enterpriseName);
 		return R.data(list);
 	}
 
@@ -845,8 +844,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<IPage> selectJj(String jurisdiction, String enterpriseName, Query query) {
+		IPage list = informationService.selectJj(Condition.getPage(query),jurisdiction, enterpriseName);
 		return R.data(list);
 	}
 
@@ -854,8 +853,8 @@
 	 * 业务统计情况
 	 */
 	@PostMapping("/selectYw")
-	public R selectYw(String jurisdiction, String deptid,Integer current,Integer size) {
-		List<Map<Object, Object>> list = informationService.selectYw(jurisdiction, deptid,current,size);
+	public R<IPage> selectYw(String jurisdiction, String deptid, Query query) {
+		IPage list = informationService.selectYw(Condition.getPage(query),jurisdiction, deptid);
 		return R.data(list);
 	}
 
@@ -872,8 +871,8 @@
 	 * 业务统计明细
 	 */
 	@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<IPage> selectDis(String jurisdiction, String deptid, String fid, Query query) {
+		IPage list = informationService.selectDis(Condition.getPage(query),jurisdiction, deptid, fid);
 		return R.data(list);
 	}
 
@@ -925,4 +924,37 @@
 		return R.data(lists);
 	}
 
+	/**
+	 * 违规经营
+	 */
+	@PostMapping("/selectWg")
+	public R selectWg() {
+		List<Map<Object, Object>> list = informationService.selectWg();
+		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);
+		}
+		return R.data(list);
+	}
+
+	/**
+	 * 经营不善
+	 */
+	@PostMapping("/selectJy")
+	public R selectJy() {
+		List<Map<Object, Object>> list = informationService.selectJy();
+		for (int i=0;i<list.size();i++){
+
+		}
+		return R.data(list);
+	}
+
+
 }

--
Gitblit v1.9.3