From 622e20b4ebd84c2e2904e3e31cd4d08f058c48e5 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 26 四月 2021 18:26:29 +0800
Subject: [PATCH] bugfixed: 78623
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 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 e86f969..68e235c 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
@@ -10,12 +10,14 @@
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
+import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.dtos.community.PageComActDTO;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
+import com.panzhihua.common.model.vos.user.InputUserInfoVO;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComActVillageDAO;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
@@ -207,7 +209,7 @@
if (result) {
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
importErrorVO.setErrorMsg("导入实有人口已存在(" + vo.getCardNo() + ")");
- importErrorVO.setErrorPosition("第" + index + "行,第2列");
+ importErrorVO.setErrorPosition("第" + index + "行，第2列");
populationImportErrorVOList.add(importErrorVO);
index++;
continue;
@@ -222,7 +224,7 @@
if (comMngVillageDO == null) {
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
importErrorVO.setErrorMsg("查无:" + vo.getRoad() + "小区/房租地址，请先新建地址");
- importErrorVO.setErrorPosition("第" + index + "行,第7,8列");
+ importErrorVO.setErrorPosition("第" + index + "行，第7、8列");
populationImportErrorVOList.add(importErrorVO);
index++;
continue;
@@ -424,4 +426,31 @@
this.updateById(populationDO);
return R.ok();
}
+
+ @Override
+ public R specialInputUser(PageInputUserDTO pageInputUserDTO){
+ IPage<InputUserInfoVO> iPage = populationDAO.specialInputUser(new Page<>(pageInputUserDTO.getPageNum()
+ ,pageInputUserDTO.getPageSize()), pageInputUserDTO);
+ return R.ok(iPage);
+ }
+
+ /**
+ * 删除特殊群体人员
+ * @param id 特殊群体id
+ * @return 删除结果
+ */
+ @Override
+ public R deleteSpecialInputUser(Long id){
+ //查询特殊群体人员
+ ComMngPopulationDO populationDO = this.baseMapper.selectById(id);
+ if(populationDO == null){
+ return R.fail("未查询到该记录");
+ }
+ populationDO.setLabel(null);
+ if(this.baseMapper.updateById(populationDO) > 0){
+ return R.ok();
+ }else{
+ return R.fail();
+ }
+ }
}
--
Gitblit v1.7.1