From e7f03acfa5ee4ad4fd6d1ee9e9ae9a5655488f6d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 09 十一月 2021 17:04:46 +0800
Subject: [PATCH] 1109修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
index 94918a2..85c8542 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
@@ -35,6 +35,7 @@
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -63,16 +64,34 @@
private ComMngPopulationHouseDAO comMngPopulationHouseDAO;
@Override
public R pageList(CommonPage commonPage) {
- return R.ok(comActFourMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
+ IPage<ComActFourMemberVO> comActFourMemberVOIPage=comActFourMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage);
+ if(!comActFourMemberVOIPage.getRecords().isEmpty()){
+ comActFourMemberVOIPage.getRecords().forEach(comActFourMemberVO -> {
+ if(comActFourMemberVO.getJurisdictionContent()!=null){
+ comActFourMemberVO.setJurisdictionContentList(JSON.parseArray(comActFourMemberVO.getJurisdictionContent(),String.class));
+ }
+ });
+ }
+ return R.ok(comActFourMemberVOIPage);
}
@Override
public R insert(ComActFourMemberVO comActFourMemberVO) {
if(comActFourMemberVO!=null&&comActFourMemberVO.getJurisdiction()!=null){
+ if(comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda().eq(ComActFourMember::getIdCard,comActFourMemberVO.getIdCard()))>0){
+ return R.fail("身份证号重复");
+ }
ComActFourMember comActFourMember=new ComActFourMember();
- List<String> jurisdictionList=comMngBuildingDAO.find(comActFourMemberVO.getJurisdiction());
+ List<String> jurisdictionList=new ArrayList<>();
+ List<String> jurisdictionList1=comMngBuildingDAO.find(comActFourMemberVO.getJurisdiction());
+ List<String> jurisdictionList2=comMngBuildingDAO.findByVillage(comActFourMemberVO.getJurisdiction());
+ if(!jurisdictionList1.isEmpty()){
+ jurisdictionList.addAll(jurisdictionList1);
+ }
+ if(!jurisdictionList2.isEmpty()){
+ jurisdictionList.addAll(jurisdictionList2);
+ }
if(!jurisdictionList.isEmpty()&&jurisdictionList.size()==jurisdictionList.stream().distinct().collect(Collectors.toList()).size()){
- comActFourMember.setJurisdictionContent(JSON.toJSONString(jurisdictionList));
AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
BeanUtils.copyProperties(comActFourMemberVO,administratorsUserVO);
administratorsUserVO.setType(3);
@@ -81,6 +100,7 @@
comActFourMemberVO.setUserId(Long.parseLong(r.getData().toString()));
comActFourMemberVO.setCreateTime(DateUtil.date());
BeanUtils.copyProperties(comActFourMemberVO,comActFourMember);
+ comActFourMember.setJurisdictionContent(JSON.toJSONString(jurisdictionList));
this.comActFourMemberDao.insert(comActFourMember);
return R.ok();
}
@@ -180,7 +200,7 @@
@Override
public R selectByMember(CommonPage commonPage) {
- IPage<ComMngPopulationVO> comMngPopulationDOIPage=this.comMngPopulationDAO.query(new Page<ComMngPopulationDO>(commonPage.getPage(),commonPage.getSize()),commonPage);
+ IPage<ComMngPopulationNoSecretVO> comMngPopulationDOIPage=this.comMngPopulationDAO.query(new Page<ComMngPopulationDO>(commonPage.getPage(),commonPage.getSize()),commonPage);
if (!comMngPopulationDOIPage.getRecords().isEmpty()) {
comMngPopulationDOIPage.getRecords().forEach(populDO -> {
if (StringUtils.isNotEmpty(populDO.getBirthday())) {
--
Gitblit v1.7.1