From 7cdea6d16a8b9f74800792ea412ad8b51c4df7f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 十月 2024 17:48:38 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 100 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 70 insertions(+), 30 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 2418a69..541925d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -167,6 +167,7 @@
// 鐢熸垚瀵嗙爜
user.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INITIAL_PASSWORD).getCode(), salt));
user.setSalt(salt);
+ user.setNeedChangePwd(Constants.ZERO);
// 鍒涘缓鐢ㄦ埛璁板綍
user.setType(insert.getType());
user.setAvatar(insert.getFaceImg());
@@ -202,17 +203,19 @@
insert.setCode(member.getCode());
insert.setType(Constants.TWO);
insert.setHkDate(new Date());
- insert.setWorkStatus(Constants.ONE);//榛樿鍦ㄨ亴
+ insert.setWorkStatus(Constants.ZERO);//榛樿鍦ㄨ亴
insert.setCanVisit(Constants.ZERO);//榛樿涓嶅彲璁块棶
insert.setAuthStatus(Constants.ZERO);
insert.setName(member.getName());
insert.setHkId(UUID.randomUUID().toString().replace("-",""));
insert.setHkStatus(Constants.ONE);
insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
- insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
+ if(StringUtils.isNotBlank(member.getIdcardNo())){
+ insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
+ insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//韬唤璇佸彿鍔犲瘑
+ insert.setIdcardDecode( Constants.getTuominStr(member.getIdcardNo()));
+ }
insert.setPhone(member.getPhone());
- insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//韬唤璇佸彿鍔犲瘑
- insert.setIdcardDecode( Constants.getTuominStr(member.getIdcardNo()));
insert.setStatus(Constants.ZERO);
return insert;
}
@@ -330,11 +333,13 @@
if (StringUtils.isNotBlank(member.getIdcardNo()) && !IdcardUtil.isValidCard(member.getIdcardNo())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"韬唤璇佸彿鏍煎紡鏈夎");
}
- if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
- .in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
- .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()))
- .eq(Member::getIsdeleted,Constants.ZERO)) >0){
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "韬唤璇佸彿銆�"+member.getIdcardNo()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+ if(StringUtils.isNotBlank(member.getIdcardNo())){
+ if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
+ .in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
+ .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()))
+ .eq(Member::getIsdeleted,Constants.ZERO)) >0){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "韬唤璇佸彿銆�"+member.getIdcardNo()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+ }
}
if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
.eq(Member::getPhone, member.getPhone())
@@ -502,16 +507,7 @@
if (PhoneUtil.isPhone(member.getPhone())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢佃瘽鍙风爜鏍煎紡鏈夎");
}
- if (IdcardUtil.isValidCard(member.getIdcardNo())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"韬唤璇佸彿鏍煎紡鏈夎");
- }
- if (IdcardUtil.getGenderByIdCard(member.getIdcardNo()) == member.getSex()){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎬у埆鏈夎");
- }
- //鑾峰彇鍑虹敓鏃ユ湡
- String birthByIdCard = IdcardUtil.getBirthByIdCard(member.getIdcardNo());
- //鑴辨晱鎿嶄綔
- String hide = IdcardUtil.hide(member.getIdcardNo(), 5, 14);
+//
//杞崲鏃ユ湡
Member insert = new Member();
insert.setCreator(loginUserInfo.getId());
@@ -524,11 +520,23 @@
insert.setImgurl(member.getImgurl());
insert.setType(Constants.ZERO);
insert.setName(member.getName());
- insert.setBirthday(DateUtil.fromStringToDate("yyyyMMdd",birthByIdCard));
insert.setPhone(member.getPhone());
- insert.setIdcardNo(Utils.Secure.encryptString(member.getIdcardNo()));
- IdcardUtil.isValidCard(member.getIdcardNo());
- insert.setIdcardDecode(hide);
+ if(StringUtils.isNotBlank(member.getIdcardNo())){
+ if (IdcardUtil.isValidCard(member.getIdcardNo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"韬唤璇佸彿鏍煎紡鏈夎");
+ }
+ if (IdcardUtil.getGenderByIdCard(member.getIdcardNo()) == member.getSex()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎬у埆鏈夎");
+ }
+ //鑾峰彇鍑虹敓鏃ユ湡
+ String birthByIdCard = IdcardUtil.getBirthByIdCard(member.getIdcardNo());
+ insert.setBirthday(DateUtil.fromStringToDate("yyyyMMdd",birthByIdCard));
+ insert.setIdcardNo(Utils.Secure.encryptString(member.getIdcardNo()));
+ IdcardUtil.isValidCard(member.getIdcardNo());
+ //鑴辨晱鎿嶄綔
+ String hide = IdcardUtil.hide(member.getIdcardNo(), 5, 14);
+ insert.setIdcardDecode(hide);
+ }
insert.setStatus(Constants.ZERO);
insert.setParentId(member.getParentId());
memberMapper.insert(insert);
@@ -902,6 +910,10 @@
.set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
.set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
.set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
+ .set( updateMember.getPositionId()!=null,Member::getPositionId,updateMember.getPositionId())
+ .set( updateMember.getIsDangyuan()!=null,Member::getIsDangyuan,updateMember.getIsDangyuan())
+ .set( updateMember.getJobDate()!=null,Member::getJobDate,updateMember.getJobDate())
+ .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
.eq(Member::getId,updateMember.getId()));
dealTrainTIme(updateMember,1,loginUserInfo);
cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper);
@@ -1118,6 +1130,9 @@
if(Objects.nonNull(member.getCompanyType())){
queryWrapper.eq(Company::getType,member.getCompanyType());
}
+ if(StringUtils.isNotBlank(member.getCompanyTypes())){
+ queryWrapper.in(Company::getType,Arrays.asList(member.getCompanyTypes().split(",")));
+ }
if(null != member.getType()) {
queryWrapper.eq(Member::getType,member.getType());
}
@@ -1221,6 +1236,9 @@
}
if (pageWrap.getModel().getName() != null) {
queryWrapper.lambda().eq(Member::getName, pageWrap.getModel().getName());
+ }
+ if (pageWrap.getModel().getPositionId() != null) {
+ queryWrapper.lambda().eq(Member::getPositionId, pageWrap.getModel().getPositionId());
}
if (pageWrap.getModel().getBirthday() != null) {
queryWrapper.lambda().ge(Member::getBirthday, Utils.Date.getStart(pageWrap.getModel().getBirthday()));
@@ -1361,6 +1379,15 @@
queryWrapper.selectAs(Position::getName,Member::getPositionName);
queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);
queryWrapper.eq(Member::getType,pageWrap.getModel().getType());
+ LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
+ if(userInfo!=null && userInfo.getCompanyIdList()!=null){
+ if( userInfo.getCompanyIdList().size() ==0){
+ //鍙兘鐪嬭嚜宸�
+ queryWrapper.eq(Member::getId,userInfo.getMemberId());
+ }else{
+ queryWrapper.in(Company::getId,userInfo.getCompanyIdList());
+ }
+ }
// queryWrapper.eq(Objects.nonNull(model.getCompanyId()),Member::getCompanyId,model.getCompanyId())
queryWrapper.in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0,
Member::getCompanyId,pageWrap.getModel().getCompanyIds())
@@ -1373,9 +1400,11 @@
.eq(Objects.nonNull(pageWrap.getModel().getCanVisit()),Member::getCanVisit,pageWrap.getModel().getCanVisit())
.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
.eq(Objects.nonNull(pageWrap.getModel().getHkStatus()),Member::getHkStatus,pageWrap.getModel().getHkStatus())
+ .eq(Objects.nonNull(pageWrap.getModel().getWorkStatus()),Member::getWorkStatus,pageWrap.getModel().getWorkStatus())
.eq(Objects.isNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,Constants.ZERO)
.eq(Objects.nonNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,pageWrap.getModel().getIsdeleted())
.eq(Objects.nonNull(pageWrap.getModel().getCompanyType()),Company::getType,pageWrap.getModel().getCompanyType())
+ .eq(Objects.nonNull(pageWrap.getModel().getPositionId()),Member::getPositionId,pageWrap.getModel().getPositionId())
.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
// .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
// .eq(Member::getType,Constants.memberType.internal)
@@ -1713,6 +1742,7 @@
.eq(StringUtils.isNotBlank(checkVisitedDTO.getName()),Member::getName,checkVisitedDTO.getName())
.eq(Member::getIsdeleted,Constants.ZERO)
.eq(Member::getStatus,Constants.ZERO)
+ .eq(Member::getWorkStatus,Constants.ZERO)
.eq(Member::getCanVisit,Constants.ONE)
.eq(Member::getType,Constants.memberType.internal)
);
@@ -1840,6 +1870,8 @@
List<Member> newList = new ArrayList<>();
for(int i=0;i<dataList.size();i++){
MemberImport model = dataList.get(i);
+ model.setPhone(ScientificNotationTUtil.convertToString(model.getPhone()));
+ model.setIdcardNo(ScientificNotationTUtil.convertToString(model.getIdcardNo()));
if(StringUtils.isBlank(model.getName())
&&StringUtils.isBlank(model.getIdcardNo())
&&StringUtils.isBlank(model.getPhone())
@@ -1898,7 +1930,7 @@
,List<Company> companyList
,Integer companyType) {
if(StringUtils.isBlank(model.getName())
- ||StringUtils.isBlank(model.getIdcardNo())
+// ||StringUtils.isBlank(model.getIdcardNo())
||StringUtils.isBlank(model.getPhone())
||StringUtils.isBlank(model.getCompanyName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屼汉鍛樹俊鎭笉瀹屾暣锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
@@ -1906,12 +1938,17 @@
if (!PhoneUtil.isPhone(model.getPhone())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屾墜鏈哄彿銆�"+model.getPhone()+"銆戞牸寮忎笉姝ｇ‘锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
}
- if ( !isDebug && !IdcardUtil.isValidCard(model.getIdcardNo())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃韩浠借瘉鍙枫��"+model.getIdcardNo()+"銆戞牸寮忎笉姝ｇ‘锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ if(StringUtils.isNotBlank(model.getIdcardNo())){
+ if ( !isDebug && !IdcardUtil.isValidCard(model.getIdcardNo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃韩浠借瘉鍙枫��"+model.getIdcardNo()+"銆戞牸寮忎笉姝ｇ‘锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ }
}
+
for(Member member: newList){
- if(StringUtils.equals(model.getIdcardNo(),member.getIdcardNo())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃韩浠借瘉鍙枫��"+model.getIdcardNo()+"銆戦噸澶嶅嚭鐜帮紝璇锋鏌ヨ〃鏍煎唴瀹癸紒");
+ if(StringUtils.isNotBlank(model.getIdcardNo())&&StringUtils.isNotBlank(member.getIdcardNo())) {
+ if (StringUtils.equals(model.getIdcardNo(), member.getIdcardNo())) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝绗�" + (index + 3) + "琛岃韩浠借瘉鍙枫��" + model.getIdcardNo() + "銆戦噸澶嶅嚭鐜帮紝璇锋鏌ヨ〃鏍煎唴瀹癸紒");
+ }
}
if(StringUtils.equals(model.getPhone(),member.getPhone())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屾墜鏈哄彿銆�"+model.getPhone()+"銆戦噸澶嶅嚭鐜帮紝璇锋鏌ヨ〃鏍煎唴瀹癸紒");
@@ -1925,9 +1962,12 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岀粍缁囧悕绉般��"+model.getCompanyName()+"銆戠被鍨嬩笉姝ｇ‘锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
}
String candNo = DESUtil.encrypt(Constants.EDS_PWD, model.getIdcardNo());
- if(findMemberFromListByIdcard(candNo,memberList ) !=null){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃韩浠借瘉鍙枫��"+model.getIdcardNo()+"銆戝凡瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ if(StringUtils.isNotBlank(model.getIdcardNo())){
+ if(findMemberFromListByIdcard(candNo,memberList ) !=null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃韩浠借瘉鍙枫��"+model.getIdcardNo()+"銆戝凡瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ }
}
+
if(findMemberFromListByPhone(model.getPhone(),memberList ) !=null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屾墜鏈哄彿銆�"+model.getPhone()+"銆戝凡瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
}
--
Gitblit v1.9.3