From 2ab17a1a9207b64b871d307279eaba879b2e69c8 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 28 九月 2021 20:57:39 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index d176d1a..0722ea0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -6668,13 +6668,24 @@
* @return 删除结果
*/
@Override
- public R deleteSpecialInputUser(Long id) {
+ public R deleteSpecialInputUser(Long id,Long communityId) {
// 查询特殊群体人员
ComMngPopulationDO populationDO = this.baseMapper.selectById(id);
if (populationDO == null) {
return R.fail("未查询到该记录");
}
populationDO.setLabel(null);
+
+ // 清理社区与人口关联信息的label信息
+ List<ComMngPopulationCommunityTagsDO> communityTagsDOList = comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>()
+ .lambda().eq(ComMngPopulationCommunityTagsDO::getPopulationId,id).eq(ComMngPopulationCommunityTagsDO::getCommunityId,communityId));
+ if(communityTagsDOList != null && communityTagsDOList.size() > 0){
+ communityTagsDOList.forEach(communityTags -> {
+ communityTags.setLabel(null);
+ comMngPopulationCommunityTagsDAO.updateById(communityTags);
+ });
+ }
+
if (this.baseMapper.updateById(populationDO) > 0) {
return R.ok();
} else {
@@ -7487,6 +7498,14 @@
*/
@Override
public R pagePopulationListApp(PagePopulationListDTO populationListDTO) {
+ if(populationListDTO.getLabel() != null && "户籍人口".equals(populationListDTO.getLabel())){
+ populationListDTO.setLabel(null);
+ populationListDTO.setOutOrLocal(PagePopulationListDTO.outOrLocal.bd);
+ }
+ if(populationListDTO.getLabel() != null && "流动人口".equals(populationListDTO.getLabel())){
+ populationListDTO.setLabel(null);
+ populationListDTO.setOutOrLocal(PagePopulationListDTO.outOrLocal.wd);
+ }
IPage<PopulationListVO> pagePopulationList = this.baseMapper.pagePopulationListApp(
new Page(populationListDTO.getPageNum(), populationListDTO.getPageSize()), populationListDTO);
if (!pagePopulationList.getRecords().isEmpty()) {
@@ -7593,10 +7612,12 @@
public R delGridPopulationAdmin(List<Long> ids) {
Integer count = this.baseMapper.getPopulationVisitingCount(ids);
if (count > 0) {
- return R.ok("您选择的数据中存在被引用的，无法删除");
+ return R.fail("您选择的数据中存在被引用的，无法删除");
}
this.baseMapper.deleteBatchIds(ids);
- return R.ok();
+ //删除人口并删除人口和社区关联关系
+ this.baseMapper.deletePopulaitonRelation(ids);
+ return R.ok("删除成功");
}
@Override
--
Gitblit v1.7.1