productDev/yunyibao.git

			@@ -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;

			/**
			* 用工信息表Service实现
			@@ -211,15 +209,25 @@
			.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;
			}

			@@ -247,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)
			@@ -262,8 +271,11 @@
			.leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
			.eq(Member::getIsdeleted, Constants.ZERO)
			.eq(InsuranceApply::getId,memberQueryDTO.getInsuranceApplyId())
			.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 " +
			.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);
			@@ -284,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)
			);
			@@ -298,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()));