From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 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 3c86c84..c46f91e 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
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.user.ComMngUserTagDTO;
import com.panzhihua.common.model.dtos.user.EexcelUserDTO;
@@ -22,6 +23,7 @@
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.StringUtils;
import com.panzhihua.service_user.dao.ComMngUserTagDAO;
import com.panzhihua.service_user.dao.SysUserInputDAO;
import com.panzhihua.service_user.model.dos.ComMngFamilyInfoDO;
@@ -89,12 +91,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());
@@ -212,6 +215,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);
}
@@ -221,17 +227,23 @@
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();
}
@Override
- public R export(ExportUserDTO exportUserDTO) {
- return null;
+ public R exportInputUser(ExportUserDTO exportUserDTO) {
+ List<EexcelUserDTO> eexcelUserDTOS=sysUserInputDAO.selectExport(exportUserDTO);
+ return R.ok(eexcelUserDTOS);
}
@@ -358,6 +370,22 @@
}
@Override
+ public R deleteSpecialInputUserTags(Long id) {
+ ComMngUserTagDO comMngUserTagDO = comMngUserTagDAO.selectById(id);
+ if(null==comMngUserTagDO){
+ return R.fail("标签不存在");
+ }
+ if(comMngUserTagDO.getSysFlag()==1){
+ return R.fail("系统预置标签不可删除");
+ }
+ int delete = comMngUserTagDAO.deleteById(id);
+ if(delete>0){
+ return R.ok();
+ }
+ return R.fail("删除失败");
+ }
+
+ @Override
public R deleteSpecialInputUser(Long id) {
SysUserInputDO sysUserInputDO = sysUserInputDAO.selectById(id);
if(null==sysUserInputDO){
@@ -380,4 +408,10 @@
}
return R.fail();
}
+
+ @Override
+ public R specialUserExport(ExportSpecialUserDTO exportSpecialUserDTO) {
+ List<EexcelUserDTO> eexcelUserDTOS=sysUserInputDAO.specialUserExport(exportSpecialUserDTO);
+ return R.ok(eexcelUserDTOS);
+ }
}
--
Gitblit v1.7.1