From 22271e641e4505ba906c3770905b7e84e3ad8d85 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 02 四月 2024 17:05:57 +0800
Subject: [PATCH] mrshi
---
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 107 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 90 insertions(+), 17 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..ffd6741 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
@@ -10,9 +10,11 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.WorktypeMapper;
import com.doumee.dao.business.dto.MemberImport;
import com.doumee.dao.business.dto.MemberQueryDTO;
import com.doumee.dao.business.dto.WorktypeImport;
+import com.doumee.dao.business.join.DispatchUnitJoinMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.MemberService;
@@ -29,10 +31,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瀹炵幇
@@ -47,6 +47,12 @@
@Autowired
private MemberJoinMapper memberJoinMapper;
+
+ @Autowired
+ private DispatchUnitJoinMapper dispatchUnitJoinMapper;
+
+ @Autowired
+ private WorktypeMapper worktypeMapper;
@Override
public Integer create(Member member) {
@@ -207,7 +213,7 @@
.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())
+ .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")
;
@@ -221,6 +227,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 +263,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 +281,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);
@@ -276,7 +293,7 @@
@Override
- public List<MemberImport> importBatch(MultipartFile file){
+ public List<MemberImport> importBatch(MultipartFile file,Integer solutionId){
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(!loginUserInfo.getType().equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氫汉鍛樻棤娉曡繘琛岃鎿嶄綔");
@@ -287,6 +304,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 +319,50 @@
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(),"瀵逛笉璧凤紝褰曞叆鏁版嵁瀛樺湪韬唤璇佸彿鐩稿悓鏁版嵁锛�");
+ }
+ List<DispatchUnit> dispatchUnitList = new ArrayList<>();
+ if(!Objects.isNull(solutionId)){
+ dispatchUnitList = dispatchUnitJoinMapper.selectJoinList(DispatchUnit.class,
+ new MPJLambdaWrapper<DispatchUnit>()
+ .selectAll(DispatchUnit.class)
+ .select("(select b.id from du_solution b where b.isdeleted=0 and b.dispatch_unit_id=t.id and b.solution_id="+solutionId+" limit 1) as du_solution_id" )
+ .eq(DispatchUnit::getIsdeleted,Constants.ZERO)
+ .eq(DispatchUnit::getStatus,Constants.ZERO)
+ .eq(DispatchUnit::getDataType,Constants.TWO)
+ .eq(loginUserInfo.getType().equals(Constants.ONE),DispatchUnit::getCompanyId,loginUserInfo.getCompanyId())
+ .exists("select b.id from du_solution b where b.isdeleted=0 and b.dispatch_unit_id=t.id and b.status = 1 and b.solution_id="+solutionId )
+ );
+ if(CollectionUtils.isNotEmpty(dispatchUnitList)){
+ for (DispatchUnit dispatchUnit:dispatchUnitList) {
+ List<Worktype> worktypeList = worktypeMapper.selectList(new QueryWrapper<Worktype>().lambda()
+ .eq(Worktype::getIsdeleted,Constants.ZERO)
+ .eq(Worktype::getDataType,Constants.TWO)
+ .eq(Worktype::getStatus,Constants.ZERO)
+ .apply("id in ( select dw.work_type_id from du_worktype dw where dw.status = 1" +
+ " and dw.du_solution_id = "+dispatchUnit.getDuSolutionId()+" )")
+ );
+ dispatchUnit.setWorktypeList(worktypeList);
+ }
+ }
+ }
+ long index = Constants.TWO;
for(MemberImport model : dataList){
+ if(StringUtils.isBlank(model.getIdCard())||model.getIdCard().length()!=18){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹韩浠借瘉淇℃伅寮傚父锛�");
+ }
+ if(StringUtils.isBlank(model.getName())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹鍚嶄俊鎭紓甯革紒");
+ }
+ index = index + Constants.ONE;
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()));
@@ -317,6 +370,26 @@
}else{
model.setSex(Constants.getSexByIdCard(model.getIdCard()));
}
+ if(StringUtils.isNotBlank(model.getDuName())&&CollectionUtils.isNotEmpty(dispatchUnitList)){
+ Optional<DispatchUnit> dispatchUnitOptional= dispatchUnitList.stream().filter(m->m.getName().equals(model.getDuName())).findFirst();
+ if(dispatchUnitOptional.isPresent()){
+ DispatchUnit dispatchUnit = dispatchUnitOptional.get();
+ model.setDuId(dispatchUnit.getId());
+ if(StringUtils.isNotBlank(model.getWorkTypeName())&&CollectionUtils.isNotEmpty(dispatchUnit.getWorktypeList())){
+ Optional<Worktype> worktypeOptional= dispatchUnit.getWorktypeList().stream().filter(m->m.getName().equals(model.getWorkTypeName())).findFirst();
+ if(worktypeOptional.isPresent()){
+ Worktype worktype = worktypeOptional.get();
+ model.setWorktypeId(worktype.getId());
+ }
+ }
+ }
+ }
+ if(Objects.isNull(model.getDuId())){
+ model.setWorkTypeName(null);
+ model.setDuName(null);
+ }else if(Objects.isNull(model.getWorktypeId())){
+ model.setWorkTypeName(null);
+ }
}
return dataList;
}
--
Gitblit v1.9.3