From 38c2ca02f470b5534f9ba687835261828a8a781d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 30 三月 2021 16:50:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 2b01bd2..a15412e 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
@@ -6,6 +6,7 @@
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.service.*;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -131,6 +132,10 @@
return comMngRealCompanyService.detailComMngRealCompany(id);
}
+ @GetMapping("/company/belongs")
+ public R belongsComMngRealCompany(@RequestBody ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO) {
+ return comMngRealCompanyService.belongsComMngRealCompany(comMngRealCompanyBelongsDTO);
+ }
/**
* 社区后台导入实有单位
* @param list 车实有单位列表
@@ -259,6 +264,18 @@
}
/**
+ * 社区后台导入实有人口
+ * @param list 数据
+ * @param communityId 社区编号
+ * @return
+ */
+ @PostMapping("/population/import")
+ @Transactional(rollbackFor = Exception.class)
+ public R listSavePopulationExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId){
+ return comMngPopulationService.listSavePopulation(list,communityId);
+ }
+
+ /**
* 根据实有人口id查询详情
* @param populationId 实有人口id
* @return 实有人口详情查询结果
--
Gitblit v1.7.1