From 5a094a318e6f4543dee18a12345ca0edb26041ca Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 28 Aug 2021 17:07:03 +0800
Subject: [PATCH] 1.首页接口调整
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 173 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 139 insertions(+), 34 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 95d04ba..ac3a543 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -18,6 +18,7 @@
import io.swagger.annotations.*;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.models.auth.In;
import lombok.AllArgsConstructor;
import javax.validation.Valid;
@@ -29,24 +30,24 @@
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.information.vo.InformationVO;
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.*;
@@ -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);
}
@@ -110,8 +111,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 +150,7 @@
dept.setAncestors("0,1420222961377357825");
dept.setDeptCategory(1);
}
- dept.setId(l);
+ //dept.setId(l);
if (iDeptService.submit(dept)) {
CacheUtil.clear(SYS_CACHE);
// 返回懒加载树更新节点所需字段
@@ -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 selectLi(String jurisdiction, String deptid) {
- List<Map<Object, Object>> list = informationService.selectLi(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);
}
@@ -836,8 +837,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 +846,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 +855,8 @@
* 业务统计情况
*/
@PostMapping("/selectYw")
- public R selectYw(String jurisdiction, String deptid) {
- List<Map<Object, Object>> list = informationService.selectYw(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);
}
@@ -863,8 +864,8 @@
* 保安员详情
*/
@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<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);
}
@@ -872,8 +873,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);
}
@@ -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);
}
/**
@@ -925,4 +920,114 @@
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
+ */
+ @PostMapping("/selectAge")
+ public R selectAge(String jurisdiction, String deptid) {
+ List<Map<Object, Object>> list = informationService.selectAge(jurisdiction, deptid);
+ int qcount = 0;//青年
+ int zcount = 0;//中年
+ int lcount = 0;//老年
+ for (int i = 0; i < list.size(); i++) {
+ String age = list.get(i).get("age").toString();
+ int a = Integer.parseInt(age);
+ if (a <= 0) {
+ continue;
+ } else if (a >= 19 && a < 35) {
+ qcount ++;
+ } else if (a >= 36 && a < 59) {
+ zcount++;
+ } else {
+ lcount++;
+ }
+ }
+ Map map = new HashMap();
+ map.put("qcount",qcount);
+ map.put("zcount",zcount);
+ map.put("lcount",lcount);
+ return R.data(map);
+ }
+
+
}
--
Gitblit v1.9.3