From db9d95db6f25f95cbc614525adef7dbdeae6478c Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 27 七月 2021 16:58:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
index 17da062..5816170 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -119,7 +119,7 @@
* @return
*/
@PostMapping("/car/export")
- public R exportRealCar(ExportComMngCarExcelDTO exportComMngCarExcelDTO){
+ public R exportRealCar(@RequestBody ExportComMngCarExcelDTO exportComMngCarExcelDTO){
return comMngCarService.exportRealCar(exportComMngCarExcelDTO);
}
@@ -132,6 +132,17 @@
@PostMapping("/company/page")
public R pageQueryComMngRealCompany(@RequestBody PageComMngRealCompanyDTO pageComMngRealCompanyDTO) {
return comMngRealCompanyService.pageQueryComMngRealCompany(pageComMngRealCompanyDTO);
+ }
+
+ /**
+ * 社区后台实有单位统计
+ *
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @PostMapping("/company/statistics")
+ public R getComMngRealCompanyTotalByAdmin(@RequestParam("communityId") Long communityId){
+ return comMngRealCompanyService.getComMngRealCompanyTotalByAdmin(communityId);
}
/**
@@ -410,6 +421,17 @@
}
/**
+ * 根据小区id查询实有人口
+ *
+ * @param villageId 小区id
+ * @return 查询结果
+ */
+ @PostMapping("/population/getListByVillageId")
+ R getPopulationListByVillageId(@RequestParam(value = "villageId") Long villageId){
+ return comMngPopulationService.getPopulationListByVillageId(villageId);
+ }
+
+ /**
* 编辑实有人口
*
* @param populationEditDTO
--
Gitblit v1.7.1