From c7a022c304c49fa91da1ebae458ccec3c484718a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 04 三月 2024 10:30:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 111 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 80 insertions(+), 31 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 f5ec6a9..bdafd31 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
@@ -22,16 +22,15 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.extern.java.Log;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
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瀹炵幇
@@ -177,37 +176,58 @@
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
MemberQueryDTO memberQueryDTO = pageWrap.getModel();
+ LoginUserInfo loginUserInfo =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
+ if(loginUserInfo.getType().equals(Constants.ONE)){
+ queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
+ }else{
+ if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
+ queryWrapper.in(InsuranceApply::getCompanyId, loginUserInfo.getCompanyIdList());
+ }else{
+ queryWrapper.eq(InsuranceApply::getCompanyId, -1);
+ }
+ queryWrapper.eq(pageWrap.getModel().getCompanyId()!=null,InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId());
+ }
queryWrapper.selectAll(Member.class)
.selectAs(DispatchUnit::getName,Member::getDuName)
.selectAs(Worktype::getName,Member::getWorkTypeName)
.selectAs(Solutions::getName,Member::getSolutionName)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .select(" case when now() between t.start_time and t.end_time then 1 else 2 end solutionsStatus ")
.leftJoin(InsuranceApply.class,InsuranceApply::getId,Member::getApplyId)
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.leftJoin(DispatchUnit.class,DispatchUnit::getId,Member::getDuId)
.leftJoin(Worktype.class,Worktype::getId,Member::getWorktypeId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
.eq(Member::getIsdeleted, Constants.ZERO)
- .eq(Member::getCompanyId, memberQueryDTO.getCompanyId())
+// .eq(Member::getCompanyId, memberQueryDTO.getCompanyId())
.like(StringUtils.isNotBlank(memberQueryDTO.getName()),Member::getName, memberQueryDTO.getName())
.like(StringUtils.isNotBlank(memberQueryDTO.getIdCard()),Member::getIdcardNo, memberQueryDTO.getIdCard())
+ .like(StringUtils.isNotBlank(memberQueryDTO.getDuName()),DispatchUnit::getName, memberQueryDTO.getDuName())
.eq(!Objects.isNull(memberQueryDTO.getDuId()),Member::getDuId, memberQueryDTO.getDuId())
- .eq(!Objects.isNull(memberQueryDTO.getSolutionsId()),Solutions::getId, memberQueryDTO.getSolutionsId())
- .ge(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&!memberQueryDTO.getSolutionsStatus().equals(Constants.ZERO),
- Member::getStartTime, DateUtil.getDate(new Date(),"yyyy-MM-dd")+" 00:00:00")
- .le(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.ONE),
- Member::getEndTime, DateUtil.getDate(new Date(),"yyyy-MM-dd")+" 23:59:59")
- .ge(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.TWO),
- Member::getEndTime, DateUtil.getDate(new Date(),"yyyy-MM-dd")+" 23:59:59")
+ .eq(!Objects.isNull(memberQueryDTO.getSolutionsId()),Solutions::getBaseId, memberQueryDTO.getSolutionsId())
+ .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")
;
+ queryWrapper.orderByAsc(DispatchUnit::getName);
+ queryWrapper.orderByAsc(Member::getName);
+// for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+// if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+// queryWrapper.orderByDesc(sortData.getProperty());
+// } else {
+// queryWrapper.orderByAsc(sortData.getProperty());
+// }
+// }
+ PageData<Member> pageData = PageData.from(memberJoinMapper.selectJoinPage(page,Member.class, queryWrapper));
-
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
+ 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()));
}
}
- PageData<Member> pageData = PageData.from(memberJoinMapper.selectJoinPage(page,Member.class, queryWrapper));
return pageData;
}
@@ -219,20 +239,46 @@
@Override
public List<Member> findListByDTO(MemberQueryDTO memberQueryDTO) {
- List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
- .selectAll(Member.class)
+
+ MPJLambdaWrapper<Member> lambdaWrapper = new MPJLambdaWrapper<Member>();
+ lambdaWrapper.selectAll(Member.class)
.selectAs(DispatchUnit::getName,Member::getDuName)
.selectAs(Worktype::getName,Member::getWorkTypeName)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .select(" case when now() between t.start_time and t.end_time then 1 else 2 end solutionsStatus ")
.leftJoin(DispatchUnit.class,DispatchUnit::getId,Member::getDuId)
.leftJoin(Worktype.class,Worktype::getId,Member::getWorktypeId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
.notIn(CollectionUtils.isNotEmpty(memberQueryDTO.getMemberIds()),Member::getId,memberQueryDTO.getMemberIds())
.eq(!Objects.isNull(memberQueryDTO.getCompanyId()),Member::getCompanyId,memberQueryDTO.getCompanyId())
.eq(Member::getIsdeleted, Constants.ZERO)
+ .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.getInsuranceApplyId()),
- " select 1 from apply_detail ad where ad.applyId = "+memberQueryDTO.getInsuranceApplyId()+" 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)
+ .selectAs(DispatchUnit::getName,Member::getDuName)
+ .selectAs(Worktype::getName,Member::getWorkTypeName)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .leftJoin(ApplyDetail.class,ApplyDetail::getMemberId,Member::getId)
+ .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
+ .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
+ .leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
+ .eq(Member::getIsdeleted, Constants.ZERO)
+ .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())&&!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);
return memberList;
}
@@ -250,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)
);
@@ -264,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