From ef8c725ba73fea5b88bb7f77684639ddf8e51e95 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 04 Dec 2021 16:32:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/information/controller/InformationsController.java |   46 ++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/information/controller/InformationsController.java b/src/main/java/org/springblade/modules/information/controller/InformationsController.java
index d21b8a6..f1e1ae5 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationsController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationsController.java
@@ -8,6 +8,7 @@
 import org.springblade.modules.information.service.IInformationService;
 import org.springblade.modules.information.vo.InformationVO;
 import org.springblade.modules.information.vo.ResponseVo;
+import org.springblade.modules.system.vo.UserVO;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -188,7 +189,7 @@
 			for (ResponseVo responseVo : performanceGroupCountList) {
 				//辖区id相同则数量相加
 				if (responseVo.getId().equals(id)){
-					count += performanceGroupCountList.get(i).getNum();
+					count += responseVo.getNum();
 				}
 			}
 
@@ -198,7 +199,7 @@
 			for (ResponseVo responseVo : examinationGroupCountList) {
 				//辖区id相同则数量相加
 				if (responseVo.getId().equals(id)){
-					count += examinationGroupCountList.get(i).getNum();
+					count += responseVo.getNum();
 				}
 			}
 
@@ -207,7 +208,7 @@
 			for (ResponseVo responseVo : examPassingGroupCountList) {
 				//辖区id相同则数量相加
 				if (responseVo.getId().equals(id)){
-					count += examPassingGroupCountList.get(i).getNum();
+					count += responseVo.getNum();
 				}
 			}
 
@@ -216,7 +217,7 @@
 			for (ResponseVo responseVo : holdGroupCountList) {
 				//辖区id相同则数量相加
 				if (responseVo.getId().equals(id)){
-					count += holdGroupCountList.get(i).getNum();
+					count += responseVo.getNum();
 				}
 			}
 
@@ -225,7 +226,7 @@
 			for (ResponseVo responseVo : soidGroupCountList) {
 				//辖区id相同则数量相加
 				if (responseVo.getId().equals(id)){
-					count += soidGroupCountList.get(i).getNum();
+					count += responseVo.getNum();
 				}
 			}
 
@@ -234,7 +235,7 @@
 			for (ResponseVo responseVo : dispatchGroupCountList) {
 				//辖区id相同则数量相加
 				if (responseVo.getId().equals(id)){
-					count += dispatchGroupCountList.get(i).getNum();
+					count += responseVo.getNum();
 				}
 			}
 
@@ -246,4 +247,37 @@
 		}
 		return R.data(lists);
 	}
+
+	/**
+	 * 根据辖区及保安公司统计未缴纳社保人员
+	 * @param query  分页条件
+	 * @param information 查询条件
+	 * @return
+	 */
+	@GetMapping("/getNotSocialNumber")
+	public R<IPage<UserVO>> getNotSocialNumber(InformationVO information, Query query){
+		return R.data(informationService.getNotSocialAndInsuranceAndDispatcherNumber(Condition.getPage(query), information,1));
+	}
+
+	/**
+	 * 根据辖区及保安公司统计未缴纳保险人员
+	 * @param query  分页条件
+	 * @param information 查询条件
+	 * @return
+	 */
+	@GetMapping("/getNotInsuranceNumber")
+	public R<IPage<UserVO>> getNotInsuranceNumber(InformationVO information, Query query){
+		return R.data(informationService.getNotSocialAndInsuranceAndDispatcherNumber(Condition.getPage(query), information,2));
+	}
+
+	/**
+	 * 根据辖区及保安公司统计未派遣人员
+	 * @param query  分页条件
+	 * @param information 查询条件
+	 * @return
+	 */
+	@GetMapping("/getNotDispatcherNumber")
+	public R<IPage<UserVO>> getNotDispatcherNumber(InformationVO information, Query query){
+		return R.data(informationService.getNotSocialAndInsuranceAndDispatcherNumber(Condition.getPage(query), information,3));
+	}
 }

--
Gitblit v1.9.3