From 2cdfc2901063cf4e7133091e2f82a89d41f3f50d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 09 Nov 2021 19:21:23 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 65 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 7 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 0bf1b89..0efc721 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;
@@ -331,18 +332,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 +358,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 +467,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;
@@ -466,10 +501,12 @@
//上个月数量
String lastnum = maps.get(i).get("lastnum").toString();
b += Integer.valueOf(lastnum);
-
+ String nums = maps.get(i).get("num").toString();
+ num += Integer.valueOf(nums);
}
map.put("thisnum", a);
map.put("lastnum", b);
+ map.put("num", num);
map.put("List", maps);
mapC.put("baoan", map);
//正常保安员数量
@@ -481,9 +518,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 +535,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 +552,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 +569,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 +586,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);
@@ -803,8 +855,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);
}
@@ -1515,9 +1567,9 @@
* 业务统计情况
*/
@PostMapping("/selectYw")
- public R<IPage> selectYw(String jurisdiction, String deptid, String stats, Query query) {
+ 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);
+ IPage list = informationService.selectYw(Condition.getPage(query), jurisdiction, deptid, stats,startTime,endTime);
return R.data(list);
} else {
String childer = informationService.selJurchilder(jurisdiction);
@@ -1527,7 +1579,7 @@
strArrays += "'" + split[j] + "',";
}
String jurisdictiond = strArrays.substring(0, strArrays.length() - 1);
- IPage list = informationService.selectYw(Condition.getPage(query), jurisdictiond, deptid, stats);
+ IPage list = informationService.selectYw(Condition.getPage(query), jurisdictiond, deptid, stats,startTime,endTime);
return R.data(list);
}
}
@@ -1716,7 +1768,6 @@
int sbnum = Integer.parseInt(sbnums);
//保安总人数为0
if (znum == 0) {
- continue;
} else {
int a = znum / 2;
if (cznum <= a || sbnum <= a) {
--
Gitblit v1.9.3