From 4c236ba83da7c69ac838b004d0a4b83c25fc9bea Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 23 二月 2024 16:41:02 +0800
Subject: [PATCH] mrshi
---
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 83bb114..30020de 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -29,10 +29,8 @@
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 鐢ㄥ伐淇℃伅琛⊿ervice瀹炵幇
@@ -221,6 +219,15 @@
// }
// }
PageData<Member> pageData = PageData.from(memberJoinMapper.selectJoinPage(page,Member.class, queryWrapper));
+
+ Integer sn = 0;
+ for (Member member:pageData.getRecords()) {
+ sn = sn + 1;
+ member.setSn(sn);
+ if(StringUtils.isNotBlank(member.getIdcardNo())){
+ member.setAge(Constants.getAgeByIdCard(member.getIdcardNo()));
+ }
+ }
return pageData;
}
@@ -248,9 +255,10 @@
.apply(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.ONE),"now() between t.start_time and t.end_time")
.apply(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.TWO),"now() > t.end_time")
.like(StringUtils.isNotBlank(memberQueryDTO.getName()),Member::getName, memberQueryDTO.getName())
- .notExists(!Objects.isNull(memberQueryDTO.getNotInInsuranceApplyId()),
- " select 1 from apply_detail ad where ad.apply_id = "+memberQueryDTO.getNotInInsuranceApplyId()+" and ad.END_TIME > now() and ad.isdeleted = 0 " +
- " and ad.member_id = t.id ");
+ .notExists(!Objects.isNull(memberQueryDTO.getNotInInsuranceApplyId())&&!Objects.isNull(memberQueryDTO.getValidTime()),
+ " select 1 from apply_detail ad where ad.apply_id = "+memberQueryDTO.getNotInInsuranceApplyId()+"" +
+ " and ad.END_TIME >= '"+DateUtil.DateToStr(memberQueryDTO.getValidTime(),"yyyy-MM-dd HH:mm:ss.SSS")+"' and ad.START_TIME <= '"+DateUtil.DateToStr(memberQueryDTO.getValidTime(),"yyyy-MM-dd HH:mm:ss.SSS")+"' and ad.isdeleted = 0 " +
+ " and ad.member_id = t.id ") ;
if(!Objects.isNull(memberQueryDTO.getInsuranceApplyId())){
lambdaWrapper = new MPJLambdaWrapper<Member>()
.selectAll(Member.class)
@@ -265,8 +273,9 @@
.eq(InsuranceApply::getId,memberQueryDTO.getInsuranceApplyId())
.le(!Objects.isNull(memberQueryDTO.getValidTime()),ApplyDetail::getStartTime,memberQueryDTO.getValidTime())
.ge(!Objects.isNull(memberQueryDTO.getValidTime()),ApplyDetail::getEndTime,memberQueryDTO.getValidTime())
- .exists(!Objects.isNull(memberQueryDTO.getInsuranceApplyId()),
- " select 1 from apply_detail ad where ad.apply_id = "+memberQueryDTO.getInsuranceApplyId()+" and ad.END_TIME > now() and ad.isdeleted = 0 " +
+ .exists(!Objects.isNull(memberQueryDTO.getInsuranceApplyId())&&!Objects.isNull(memberQueryDTO.getValidTime()),
+ " select 1 from apply_detail ad where ad.apply_id = "+memberQueryDTO.getInsuranceApplyId()+"" +
+ " and ad.END_TIME >= '"+DateUtil.DateToStr(memberQueryDTO.getValidTime(),"yyyy-MM-dd HH:mm:ss.SSS")+"' and ad.START_TIME <= '"+DateUtil.DateToStr(memberQueryDTO.getValidTime(),"yyyy-MM-dd HH:mm:ss.SSS")+"' and ad.isdeleted = 0 " +
" and ad.member_id = t.id ");
}
List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,lambdaWrapper);
@@ -287,6 +296,7 @@
.selectAs(Worktype::getName,Member::getWorkTypeName)
.leftJoin(DispatchUnit.class,DispatchUnit::getId,Member::getDuId)
.leftJoin(Worktype.class,Worktype::getId,Member::getWorktypeId)
+ .isNotNull(Member::getIdcardNo)
.eq(Member::getCompanyId,loginUserInfo.getCompanyId())
.eq(Member::getIsdeleted,Constants.ZERO)
);
@@ -301,15 +311,17 @@
if(dataList == null || dataList.size() ==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏁版嵁涓虹┖锛�");
}
+ List<String> idCardList = dataList.stream().map(m->m.getIdCard()).collect(Collectors.toList());
+ Set<String> set = new HashSet<>(idCardList);
+ if(idCardList.size() != set.size()){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝褰曞叆鏁版嵁瀛樺湪韬唤璇佸彿鐩稿悓鏁版嵁锛�");
+ }
for(MemberImport model : dataList){
if(CollectionUtils.isNotEmpty(list)){
- Member member = list.stream().filter(m->m.getIdcardNo().equals(model.getIdCard())).findAny().get();
- if(!Objects.isNull(member)){
-// model.setWorkTypeId(member.getWorktypeId());
-// model.setWorkTypeName(member.getWorkTypeName());
+ Optional<Member> memberOptional= list.stream().filter(m->m.getIdcardNo().equals(model.getIdCard())).findFirst();
+ if(memberOptional.isPresent()){
+ Member member = memberOptional.get();
model.setIdCard(member.getIdcardNo());
-// model.setDuId(member.getDuId());
-// model.setDuName(member.getDuName());
model.setSex(member.getSex());
}else{
model.setSex(Constants.getSexByIdCard(model.getIdCard()));
--
Gitblit v1.9.3