From 51ba2f4fa0708438b0aecb49e24d2482fb8c4af2 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 06 八月 2021 10:50:46 +0800
Subject: [PATCH] 实有人口新增模板导入
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 96 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 94 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 4655aee..b127eb9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1703,6 +1703,76 @@
R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
/**
+ * 批量导入吸毒人员
+ *
+ * @param list 吸毒人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importDrug")
+ R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 批量导入社区矫正人员
+ *
+ * @param list 社区矫正人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importCorrect")
+ R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 批量导入重精人员
+ *
+ * @param list 重精人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importMajor")
+ R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 批量导入邪教人员
+ *
+ * @param list 邪教人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importCult")
+ R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 批量导入刑释人员
+ *
+ * @param list 刑释人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importRehabilitation")
+ R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 批量导入重点上访人员
+ *
+ * @param list 重点上访人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importKey")
+ R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 批量导入服刑人员
+ *
+ * @param list 服刑人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importSentence")
+ R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
* 确认导入实有人口（有则更新，无则新建）
*
* @param list 用户信息
@@ -3823,7 +3893,7 @@
* @return 安全工作记录详情查询结果
*/
@GetMapping("/patrolRecord/safetyWorkRecord/detail")
- R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId);
+ R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId, @RequestParam(value = "communityId", required = false) Long communityId);
/**
* 根据巡查记录id查询安全工作记录详情
@@ -3832,7 +3902,7 @@
* @return 安全工作记录详情查询结果
*/
@GetMapping("/patrolRecord/safetyWorkRecord/detailByPrId")
- R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId);
+ R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId, @RequestParam(value = "communityId", required = false) Long communityId);
/**
* 分页查询隐患报告
@@ -3986,6 +4056,14 @@
R pageRota(@RequestBody ComSwRotaPageDTO comSwRotaPageDTO);
/**
+ * 根据id查询值班表
+ * @param rotaId 值班表id
+ * @return 值班表详情
+ */
+ @GetMapping("/patrolRecord/rota/detail")
+ R detailRota(@RequestParam("rotaId") Long rotaId);
+
+ /**
* 新增值班表
*
* @param comSwRotaSaveDTOs 新增参数
@@ -4018,4 +4096,18 @@
@GetMapping("/patrolRecord/rota/getRotaLeaderByDate")
R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate);
+ /**
+ * 批量导入值班表
+ *
+ * @param list 值班表集合
+ */
+ @PostMapping("/patrolRecord/rota/import")
+ R listSaveSwRotaExcelVO(@RequestBody List<ComSwRotaExcelVO> list, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 定时任务检测即将开始的社区活动，并使用订阅消息通知用户
+ */
+ @PostMapping("timedTaskActivityNotice")
+ R timedTaskActivityNotice();
+
}
--
Gitblit v1.7.1