From 5fb38e71cc5ab8eee8e7f489c4476d59104f07df Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 14 Jul 2021 16:59:40 +0800
Subject: [PATCH] 1.接口调整
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 54 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 31 insertions(+), 23 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 17d3e4e..9a5d54a 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -19,6 +19,7 @@
import io.swagger.annotations.*;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
+
import javax.validation.Valid;
import org.springblade.core.mp.support.Condition;
@@ -46,7 +47,7 @@
import java.util.Map;
/**
- * 控制器
+ * 控制器
*
* @author BladeX
* @since 2021-07-07
@@ -78,7 +79,7 @@
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入information")
- public R<IPage<Information>> list(@ApiIgnore @RequestParam Map<String, Object> information , Query query) {
+ public R<IPage<Information>> list(@ApiIgnore @RequestParam Map<String, Object> information, Query query) {
IPage<Information> pages = informationService.page(Condition.getPage(query), Condition.getQueryWrapper(information, Information.class));
return R.data(pages);
}
@@ -140,20 +141,20 @@
/**
* 首页保安公司统计接口
+ *
* @return
*/
@PostMapping("/SelectCount")
public R SelectCount() {
- String name="分局";
- List<Map<Object, String>> list = iDeptService.selectCount(name);
+ List<Map<Object, String>> list = iDeptService.selectCount();
List<Map<String, Object>> lists = new ArrayList<>();
- for (int i=0;i<list.size();i++){
+ 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
+ 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);
+ map.put("name", title);
+ map.put("server", maps);
lists.add(map);
}
return R.data(lists);
@@ -161,32 +162,40 @@
/**
* 首页保安持证统计接口
+ *
* @return
*/
@PostMapping("/SelectCounthold")
public R SelectCounthold() {
- String name="分局";
- List<Map<Object, String>> list = iDeptService.selectCount(name);
+ 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;//总的未持证数量
+ 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, Integer> objectStringMap = iDeptService.selectHold(String.valueOf(list.get(i).get("jurisdiction")));
- cznumber=objectStringMap.get("cz");;
- wcznumber=objectStringMap.get("wcz");;
- map.put("name",title);
- map.put("cz",cznumber);
- map.put("wcz",wcznumber);
- lists.add(map);
+ if (objectStringMap==null) {
+ map.put("name", title);
+ map.put("cz", cznumber);
+ map.put("wcz", wcznumber);
+ lists.add(map);
+ }
+ else {
+ cznumber = objectStringMap.get("cz");
+ wcznumber = objectStringMap.get("wcz");
+ map.put("name", title);
+ map.put("cz", cznumber);
+ map.put("wcz", wcznumber);
+ lists.add(map);
+ }
}
return R.data(lists);
}
/**
- *统计保安公司未持证的保安的公司数量
+ * 统计保安公司未持证的保安的公司数量
*/
@PostMapping("/selectInCount")
public R selectInCount() {
@@ -196,12 +205,11 @@
/**
- *管辖区域下拉
+ * 管辖区域下拉
*/
@PostMapping("/selecttree")
public R selecttree() {
- String name="分局";
- List<Map<Object, String>> maps = iDeptService.selectCount(name);
+ List<Map<Object, String>> maps = iDeptService.selectCount();
return R.data(maps);
}
--
Gitblit v1.9.3