productDev/yunyibao.git

			@@ -32,6 +32,7 @@
			import lombok.extern.java.Log;
			import org.apache.commons.lang3.StringUtils;
			import org.apache.shiro.SecurityUtils;
			import org.checkerframework.checker.units.qual.C;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.web.multipart.MultipartFile;
			@@ -311,6 +312,9 @@
			" 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())){
			if(Objects.isNull(memberQueryDTO.getValidTime())){
			memberQueryDTO.setValidTime(new Date());
			}
			lambdaWrapper = new MPJLambdaWrapper<Member>()
			.select(Member::getId,Member::getName,Member::getIdcardNo)
			.selectAs(Worktype::getId,Member::getWorktypeId)
			@@ -333,12 +337,14 @@
			.eq(InsuranceApply::getId,memberQueryDTO.getInsuranceApplyId())
			.and(StringUtils.isNotBlank(memberQueryDTO.getName()),i->i.like(Member::getName,memberQueryDTO.getName())
			.or().like(Member::getIdcardNo,memberQueryDTO.getName()))
			.le(!Objects.isNull(memberQueryDTO.getValidTime()),ApplyDetail::getStartTime,memberQueryDTO.getValidTime())
			// .le(!Objects.isNull(memberQueryDTO.getValidTime()),ApplyDetail::getStartTime,memberQueryDTO.getValidTime())
			.ge(!Objects.isNull(memberQueryDTO.getValidTime()),ApplyDetail::getEndTime,memberQueryDTO.getValidTime())
			.in(CollectionUtils.isNotEmpty(memberQueryDTO.getSubtractMemberIds()),Member::getId,memberQueryDTO.getSubtractMemberIds())
			.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.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);
			@@ -398,10 +404,6 @@
			if (DateUtil.compareDate(insuranceApply.getEndTime(),new Date()) >= Constants.ZERO ) {
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "保单已过保，不支持该操作");
			}
			if (DateUtil.compareDate(insuranceApply.getEndTime(),new Date()) >= Constants.ZERO ) {
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "保单已过保，不支持该操作");
			}

			Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
			if(Objects.isNull(solutions)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到保险方案");
			@@ -428,13 +430,16 @@
			.eq(ApplyDetail::getApplyId,insuranceApply.getId())
			.eq(ApplyDetail::getApplyId,insuranceApply.getId())
			.eq(ApplyDetail::getIdcardNo,model.getIdCard())
			.le(ApplyDetail::getStartTime,DateUtil.getMontageDate(new Date(),1))
			/* .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(new Date(),1))*/
			.ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(new Date(),3)));
			if(detail == null){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "当前保单下，员工【" + model.getName()+model.getIdCard() + "】非在保人员，无法进行该操作");
			}
			if(!StringUtils.equals(model.getName(), detail.getMemberName())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "当前保单下，员工【" +model.getName()+ model.getIdCard() + "】与其登记在保记录姓名不一致，请核实填写正确再操作");
			}
			if(!Constants.equalsInteger(Constants.ZERO, detail.getChangeStatus())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "当前保单下，员工【" +model.getName()+ model.getIdCard() + "】已进行过减保申请，不能再次进行该操作");
			}
			model.setDuId(detail.getDuId());
			model.setDuName(detail.getDuName());
			@@ -498,7 +503,8 @@
			List<DispatchUnit> 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" )
			// .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" )
			.select("(select b.id from du_solution b where b.isdeleted=0 and b.dispatch_unit_id=t.id and b.solution_id="+solutionId+" order by b.CHECK_DATE desc limit 1) as du_solution_id" )
			.eq(DispatchUnit::getIsdeleted,Constants.ZERO)
			.eq(DispatchUnit::getStatus,Constants.ZERO)
			.eq(DispatchUnit::getDataType,Constants.TWO)
			@@ -544,7 +550,7 @@
			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();
			Optional<Worktype> worktypeOptional= dispatchUnit.getWorktypeList().stream().filter(m->m.getName().replaceAll(" ","").equals(model.getWorkTypeName().replaceAll(" ",""))).findFirst();
			if(worktypeOptional.isPresent()){
			Worktype worktype = worktypeOptional.get();
			model.setWorktypeId(worktype.getId());