From e4a41c7a71606446416c57158fbf828713bb86ff Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 31 十月 2024 18:48:05 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 79 +++++++++++++++++++++++++++++++++------
1 files changed, 66 insertions(+), 13 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 c9dd225..72dbddb 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
@@ -62,6 +62,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.*;
import java.util.stream.Collectors;
@@ -167,6 +168,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,13 +204,16 @@
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.setJobDate(member.getJobDate());
+ insert.setIsDangyuan(member.getIsDangyuan());
+ insert.setPositionId(member.getPositionId());
if(StringUtils.isNotBlank(member.getIdcardNo())){
insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//韬唤璇佸彿鍔犲瘑
@@ -909,6 +914,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);
@@ -1119,17 +1128,27 @@
.selectAs(Company::getName,Member::getCompanyName) ;
queryWrapper.selectAs(Position::getName,Member::getPositionName);
queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
if(StringUtils.isNotBlank(member.getName())){
queryWrapper.like(Member::getName,member.getName());
}
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());
}
if(null != member.getCompanyId()) {
queryWrapper.eq(Member::getCompanyId,member.getCompanyId());
+ }
+ if(null != member.getQuerySpecial() && Constants.equalsInteger(member.getQuerySpecial(),Constants.ONE)){
+ String companySpecialId = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SPECIAL_COMPANY_ID).getCode();
+ if(StringUtils.isNotBlank(companySpecialId)){
+ queryWrapper.apply(" find_in_set('"+companySpecialId+"',REPLACE(t3.company_path,'/',',')) ");
+ }
}
queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
queryWrapper.eq(Member::getWorkStatus,Constants.ZERO);
@@ -1228,6 +1247,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()));
@@ -1363,11 +1385,22 @@
queryWrapper.selectAs(Company::getCompanyNamePath,Member::getCompanyNamePath);
queryWrapper.selectAs(Company::getCompanyPath,Member::getCompanyPath);
queryWrapper.select(" ( select count(1) from member_card mc where mc.isdeleted = 0 and mc.member_id = t.id ) as memberCardCount ");
+ queryWrapper.select(" ( select max(tt.END_TIME) from train_time tt where tt.isdeleted = 0 and tt.member_id = t.id ) as trainEndTime ");
+
queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Member::getEditor);
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
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())
@@ -1380,9 +1413,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)
@@ -1606,9 +1641,11 @@
}catch (Exception e){
}
- List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>()
- .lambda().eq(Member::getIsdeleted,Constants.ZERO)
- .eq(Member::getType,Constants.memberType.internal)
+ List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .eq(Company::getType,Constants.ZERO)
.eq(Member::getStatus,Constants.ZERO)
.isNotNull(Member::getHkId)
.apply("to_days(LAST_VISIT_DATE)+ "+days+" < to_days(now())" ));
@@ -1720,8 +1757,9 @@
.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)
+ .eq(Company::getType,Constants.ONE)
);
List<MemberVO> memberVOList = new ArrayList<>();
if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
@@ -1830,7 +1868,7 @@
ExcelImporter ie = null;
List<MemberImport> dataList =null;
try {
- ie = new ExcelImporter(file,1,0);
+ ie = new ExcelImporter(file,2,0);
dataList = ie.getDataList(MemberImport.class,null);
} catch (Exception e) {
e.printStackTrace();
@@ -1847,6 +1885,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())
@@ -1905,7 +1945,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)+"琛屼汉鍛樹俊鎭笉瀹屾暣锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
@@ -1913,12 +1953,22 @@
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(model.getPhone().indexOf(".")>=Constants.ZERO){
+ model.setPhone(
+ String.valueOf(new BigDecimal(model.getPhone()).intValue())
+ );
}
+ 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()+"銆戦噸澶嶅嚭鐜帮紝璇锋鏌ヨ〃鏍煎唴瀹癸紒");
@@ -1932,9 +1982,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