From a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 16 七月 2021 14:20:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java
index 3594586..045d139 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java
@@ -1,12 +1,13 @@
package com.panzhihua.service_community.api;
+import com.panzhihua.common.model.dtos.community.ComExServicemanDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationRelationHouseDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.service_community.service.ComExServicemanService;
import com.panzhihua.service_community.service.ComMngPopulationHouseService;
import com.panzhihua.service_community.service.ComMngPopulationService;
import lombok.extern.slf4j.Slf4j;
@@ -24,6 +25,8 @@
private ComMngPopulationService comMngPopulationService;
@Resource
private ComMngPopulationHouseService comMngPopulationHouseService;
+ @Resource
+ private ComExServicemanService comExServicemanService;
/**
* 获取人口数据信息
@@ -131,5 +134,16 @@
return comMngPopulationHouseService.populationRelationHouse(relationHouseDTO);
}
+ /**
+ * 分页查询退役军人列表
+ *
+ * @param comExServicemanDTO 请求参数
+ * @return 退役军人列表
+ */
+ @PostMapping("/page/exServiceman")
+ public R pageExServiceman(@RequestBody ComExServicemanDTO comExServicemanDTO){
+ return comExServicemanService.getPageExServiceman(comExServicemanDTO);
+ }
+
}
--
Gitblit v1.7.1