From a841e7d34df4edf9955da8e1db09ed8de079ad95 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 15 Sep 2021 19:23:44 +0800
Subject: [PATCH] 1.现场检查新增字段 2.用户表新增是否缴纳保险字段 3.统计接口新增，修改

---
 src/main/java/org/springblade/modules/information/controller/InformationsController.java |   38 ++++++++++++++++++++++++++++++--------
 1 files changed, 30 insertions(+), 8 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 5e0822a..a72081d 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationsController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationsController.java
@@ -63,8 +63,8 @@
 	 * @param information 查询条件
 	 * @return
 	 */
-	@GetMapping("/getSecurityUnitHoldLess50Page")
-	public R<IPage<InformationVO>> getSecurityUnitHoldLess50Page(InformationVO information, Query query){
+	@GetMapping("/getSecurityUnitHoldLessPage")
+	public R<IPage<InformationVO>> getSecurityUnitHoldLessPage(InformationVO information, Query query){
 		return R.data(informationService.getSecurityUnitHoldLess50Page(Condition.getPage(query), information));
 	}
 
@@ -74,8 +74,8 @@
 	 * @param information 查询条件
 	 * @return
 	 */
-	@GetMapping("/getSecurityUnitDispatcherLess50Page")
-	public R<IPage<InformationVO>> getSecurityUnitDispatcherLess50Page(InformationVO information, Query query){
+	@GetMapping("/getSecurityUnitDispatcherLessPage")
+	public R<IPage<InformationVO>> getSecurityUnitDispatcherLessPage(InformationVO information, Query query){
 		return R.data(informationService.getSecurityUnitDispatcherLess50Page(Condition.getPage(query), information));
 	}
 
@@ -85,9 +85,20 @@
 	 * @param information 查询条件
 	 * @return
 	 */
-	@GetMapping("/getSecurityUnitSoilLess50Page")
-	public R<IPage<InformationVO>> getSecurityUnitSoilLess50Page(InformationVO information, Query query){
+	@GetMapping("/getSecurityUnitSoilLessPage")
+	public R<IPage<InformationVO>> getSecurityUnitSoilLessPage(InformationVO information, Query query){
 		return R.data(informationService.getSecurityUnitSoilLess50Page(Condition.getPage(query), information));
+	}
+
+	/**
+	 * 根据辖区查询统计保安公司保险缴纳率低于90%的保安公司个数及保安公司分页信息（本市保安公司，分公司）
+	 * @param query  分页条件
+	 * @param information 查询条件
+	 * @return
+	 */
+	@GetMapping("/getSecurityUnitInsuranceLessPage")
+	public R<IPage<InformationVO>> getSecurityUnitInsuranceLessPage(InformationVO information, Query query){
+		return R.data(informationService.getSecurityUnitInsuranceLessPage(Condition.getPage(query), information));
 	}
 
 	/**
@@ -96,8 +107,8 @@
 	 * @param information 查询条件
 	 * @return
 	 */
-	@GetMapping("/getSecurityUnitExamLess50Page")
-	public R<IPage<InformationVO>> getSecurityUnitExamLess50Page(InformationVO information, Query query){
+	@GetMapping("/getSecurityUnitExamLessPage")
+	public R<IPage<InformationVO>> getSecurityUnitExamLessPage(InformationVO information, Query query){
 		return R.data(informationService.getSecurityUnitExamLess50Page(Condition.getPage(query), information));
 	}
 
@@ -111,4 +122,15 @@
 	public R<IPage<InformationVO>> getSubstationWarnInfoPage(InformationVO information, Query query){
 		return R.data(informationService.getSubstationWarnInfoPage(Condition.getPage(query), information));
 	}
+
+	/**
+	 * 根据辖区查询统计当前辖区下的保安公司（本市保安公司，分公司））服务对象小于2家的公司数量的分页信息
+	 * @param query  分页条件
+	 * @param information 查询条件
+	 * @return
+	 */
+	@GetMapping("/getSecurityUnitServerLessPage")
+	public R<IPage<InformationVO>> getSecurityUnitServerLessPage(InformationVO information, Query query){
+		return R.data(informationService.getSecurityUnitServerLess2Page(Condition.getPage(query), information));
+	}
 }

--
Gitblit v1.9.3