From 62d2377c27bf65a048a7c104b256efcd32ad2319 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 19 八月 2021 17:53:40 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java
index 2077637..4000486 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java
@@ -23,6 +23,8 @@
import com.panzhihua.common.model.vos.user.InputUserInfoVO;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.SensitiveUtil;
+import com.panzhihua.common.utlis.Snowflake;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_user.dao.ComMngUserTagDAO;
import com.panzhihua.service_user.dao.SysUserInputDAO;
import com.panzhihua.service_user.model.dos.ComMngFamilyInfoDO;
@@ -90,12 +92,13 @@
if(count==0){
SysUserInputDO sysUserInputDO=new SysUserInputDO();
String doorNumber = eexcelUserDTO.getDoorNumber();
- List<ComMngStructHouseVO> collect = comMngStructHouseVOS1.stream().filter(comMngStructHouseVO -> comMngStructHouseVO.getHouseName().equals(doorNumber)).collect(Collectors.toList());
- if (ObjectUtils.isEmpty(collect)) {
- throw new ServiceException("门牌号后台不存在或格式错误,错误门牌号为"+doorNumber);
- }else{
- sysUserInputDO.setHouseCode(collect.get(0).getHouseCode());
- }
+ //暂时注释门牌号匹配设置房屋编号功能
+// List<ComMngStructHouseVO> collect = comMngStructHouseVOS1.stream().filter(comMngStructHouseVO -> comMngStructHouseVO.getHouseName().equals(doorNumber)).collect(Collectors.toList());
+// if (ObjectUtils.isEmpty(collect)) {
+// throw new ServiceException("门牌号后台不存在或格式错误,错误门牌号为"+doorNumber);
+// }else{
+// sysUserInputDO.setHouseCode(collect.get(0).getHouseCode());
+// }
sysUserInputDO.setAreaId(comMngStructAreaVO.getId());
sysUserInputDO.setCommunityId(comMngStructAreaVO.getCommunityId());
sysUserInputDO.setCompany(eexcelUserDTO.getCompany());
@@ -213,6 +216,9 @@
iPage.getRecords().forEach(record->{
record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard()));
+ if(!StringUtils.isEmpty(record.getTags()) && record.getTags().endsWith(",")){
+ record.setTags(record.getTags().substring(0,record.getTags().length()-1));
+ }
});
return R.ok(iPage);
}
@@ -222,10 +228,15 @@
SysUserInputDO userInputDO=new SysUserInputDO();
userInputDO.setId(inputUserTagsDTO.getId());
userInputDO.setTags(inputUserTagsDTO.getTags());
- List<SysUserInputDO> all = sysUserInputDAO.selectList(new QueryWrapper<SysUserInputDO>().lambda().eq(SysUserInputDO::getIdCard,userInputDO.getIdCard()));
+ List<SysUserInputDO> all = sysUserInputDAO.selectList(new QueryWrapper<SysUserInputDO>().lambda().eq(SysUserInputDO::getId,userInputDO.getId()));
all.forEach(d->{
- d.setTags(inputUserTagsDTO.getTags());
+ if(!StringUtils.isEmpty(d.getTags())){
+ d.setTags(d.getTags()+","+inputUserTagsDTO.getTags());
+ }else{
+ d.setTags(inputUserTagsDTO.getTags());
+ }
sysUserInputDAO.updateById(userInputDO);
+
});
return R.ok();
}
@@ -339,22 +350,22 @@
return R.fail("系统预置标签不可修改");
}
ComMngUserTagDO exist = comMngUserTagDAO.selectOne(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName,comMngTagVO.getTagName()));
- if(null!=exist && exist.getId()!=comMngUserTagDO.getId()){
+ if(null!=exist && !exist.getId().equals(comMngTagVO.getId())){
return R.fail("标签重复");
}
comMngUserTagDO.setTagName(comMngTagVO.getTagName());
comMngUserTagDAO.updateById(comMngUserTagDO);
}else{
- int count = comMngUserTagDAO.selectCount(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName,comMngTagVO.getTagName()));
- if(count>0){
- return R.fail("标签重复");
+ ComMngUserTagDO comMngUserTagDO = comMngUserTagDAO.getSpecialInputUserTagsByVO(comMngTagVO);
+ if(comMngUserTagDO != null && comMngUserTagDO.getCommunityId().equals(comMngTagVO.getCommunityId())){
+ return R.fail("标签重复");
}
- ComMngUserTagDO comMngUserTagDO = new ComMngUserTagDO();
- comMngUserTagDO.setTagName(comMngTagVO.getTagName());
- comMngUserTagDO.setCommunityId(comMngTagVO.getCommunityId());
- comMngUserTagDO.setSysFlag(0);
- comMngUserTagDO.setCreateAt(new Date());
- comMngUserTagDAO.insert(comMngUserTagDO);
+ ComMngUserTagDO comMngUserTagDO1 = new ComMngUserTagDO();
+ comMngUserTagDO1.setTagName(comMngTagVO.getTagName());
+ comMngUserTagDO1.setCommunityId(comMngTagVO.getCommunityId());
+ comMngUserTagDO1.setSysFlag(0);
+ comMngUserTagDO1.setCreateAt(new Date());
+ comMngUserTagDAO.insert(comMngUserTagDO1);
}
return R.ok();
}
--
Gitblit v1.7.1