From c64da5152d32c366eecfb20b3fdc023be1d27681 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 14 七月 2021 15:26:19 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 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 2d2984f..17da062 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
@@ -4,6 +4,7 @@
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.user.ComMngTagVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.service_community.service.*;
@@ -109,6 +110,17 @@
@PostMapping("/car/import")
public R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list, @RequestParam("communityId") Long communityId) {
return comMngCarService.listSaveMngCarExcelVO(list, communityId);
+ }
+
+ /**
+ * 车辆导出
+ *
+ * @param exportComMngCarExcelDTO
+ * @return
+ */
+ @PostMapping("/car/export")
+ public R exportRealCar(ExportComMngCarExcelDTO exportComMngCarExcelDTO){
+ return comMngCarService.exportRealCar(exportComMngCarExcelDTO);
}
/**
@@ -431,6 +443,36 @@
}
/**
+ * 基础数据》特殊群体》分页查询标签列表
+ * @param comMngUserTagDTO
+ * @return
+ */
+ @PostMapping("/special/tags/page")
+ public R specialInputUserTags(@RequestBody PageInputUserDTO comMngUserTagDTO){
+ return comMngPopulationService.specialInputUserTags(comMngUserTagDTO);
+ }
+
+ /**
+ * 新增或修改特殊群体标签
+ * @param comMngTagVO
+ * @return
+ */
+ @PostMapping("/special/tags/save")
+ public R saveSpecialInputUserTags(@RequestBody ComMngTagVO comMngTagVO){
+ return comMngPopulationService.saveSpecialInputUserTags(comMngTagVO);
+ }
+
+ /**
+ * 删除特殊群体标签
+ * @param id
+ * @return
+ */
+ @PostMapping("/special/tags/delete")
+ public R deleteSpecialInputUserTags(@RequestParam(value = "id") Long id){
+ return comMngPopulationService.deleteSpecialInputUserTags(id);
+ }
+
+ /**
* 编辑实有人口_电子档案
*
* @param userElectronicFileVO
--
Gitblit v1.7.1