Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-06-17 63aab08cd422e940bf27a6908acd0e93a4df3a5c

 server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -21,6 +21,7 @@
import com.doumee.dao.business.join.ApplyDetailJoinMapper;
import com.doumee.dao.business.join.DispatchUnitJoinMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.join.SolutionWorktypeJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.MemberService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -39,6 +40,8 @@

import java.math.BigDecimal;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

/**
@@ -67,6 +70,8 @@
    private SolutionsMapper solutionsMapper;
    @Autowired
    private InsuranceApplyMapper insuranceApplyMapper;
    @Autowired
    private SolutionWorktypeJoinMapper solutionWorktypeJoinMapper;

    @Override
    public Integer create(Member member) {
@@ -312,6 +317,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)
@@ -334,29 +342,38 @@
                    .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);
        if(!Objects.isNull(memberQueryDTO.getInsuranceApplyId())&&Objects.isNull(memberQueryDTO.getValidTime())){
        if(!Objects.isNull(memberQueryDTO.getInsuranceApplyId())&&Objects.nonNull(memberQueryDTO.getValidTime())){
            if(CollectionUtils.isNotEmpty(memberList)){
                Solutions solutions = solutionsMapper.selectById(memberList.get(Constants.ZERO).getSolutionId());
                Date  reduceEndTime = DateUtil.getMontageDate(
                        DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
                memberList = memberList.stream().filter(member->member.getDetailStartTime().getTime()<=reduceEndTime.getTime()
                        &&member.getDetailEndTime().getTime()>=reduceEndTime.getTime()).collect(Collectors.toList());
//                Date  reduceEndTime = DateUtil.getMontageDate(
//                        DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
//                Date  reduceEndTime = DateUtil.getMontageDate(new Date(),3);
                for (Member member:memberList) {
                    //减保业务 使用 选择人员 根据日期实时查询
                    member.setFee(
                    Constants.reduceFee(solutions,
                            Objects.isNull(member.getDetailServerCost())?
                            solutions.getPrice():solutions.getPrice().add(member.getDetailServerCost()),member.getStartTime(),member.getEndTime(),member.getDetailStartTime(),
                            reduceEndTime).subtract(member.getFee()));
                    //如果当前日期 小于 人员保单明细记录的开始时间 则使用开始日期  开始日期 = 结束日期  且 费用全部退回
//                    if(System.currentTimeMillis()<=member.getStartTime().getTime()){
//                        member.setFee(solutions.getPrice().multiply(new BigDecimal(-1)));
                    if(System.currentTimeMillis()<=member.getDetailStartTime().getTime()){
                            member.setFee(member.getFee().multiply(new BigDecimal(-1)));
                    }else{
                        Date  reduceEndTime = DateUtil.getMontageDate(
                            DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
                        member.setFee(
                                Constants.reduceFee(solutions,
                                        Objects.isNull(member.getDetailServerCost())?
                                                solutions.getPrice():solutions.getPrice().add(member.getDetailServerCost()),member.getStartTime(),member.getEndTime(),member.getDetailStartTime(),
                                        reduceEndTime).subtract(member.getFee()));
                    }
                }
            }

@@ -399,14 +416,14 @@
        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(),"未查询到保险方案");
        }
//        Date  reduceEndTime = DateUtil.getMontageDate(
//                DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);

//        Date  reduceEndTime = DateUtil.getMontageDate(new Date(),3);
        int index = Constants.TWO;
        Map<String,String> idCardMap = new HashMap<>();
        for(MemberReduceImport model : dataList){
@@ -420,8 +437,8 @@
                            .selectAll(ApplyDetail.class)
                            .selectAs(Worktype::getName,ApplyDetail::getWorkTypeName)
                            .selectAs(DispatchUnit::getName,ApplyDetail::getDuName)
                            .selectAs(InsuranceApply::getStartTime,ApplyDetail::getStartTime)
                            .selectAs(InsuranceApply::getFinalEndTime,ApplyDetail::getEndTime)
//                            .selectAs(InsuranceApply::getStartTime,ApplyDetail::getStartTime)
//                            .selectAs(InsuranceApply::getEndTime,ApplyDetail::getEndTime)
                            .selectAs(InsuranceApply::getServerCost,ApplyDetail::getDetailServerCost)
                            .leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
                            .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
@@ -429,8 +446,11 @@
                            .eq(ApplyDetail::getApplyId,insuranceApply.getId())
                            .eq(ApplyDetail::getApplyId,insuranceApply.getId())
                            .eq(ApplyDetail::getIdcardNo,model.getIdCard())
                            .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(new Date(),1))
                            .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(new Date(),3)));
                         /*   .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(new Date(),1))*/
                            .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(new Date(),3))
                            .orderByAsc(ApplyDetail::getEndTime)
                            .last(" limit 1 ")
            );
            if(detail == null){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "当前保单下，员工【" + model.getName()+model.getIdCard() + "】非在保人员，无法进行该操作");
            }
@@ -443,12 +463,22 @@
            model.setDuId(detail.getDuId());
            model.setDuName(detail.getDuName());
            model.setWorktypeId(detail.getWorktypeId());
            model.setMemberId(detail.getMemberId());
            model.setWorkTypeName(detail.getWorkTypeName());
            model.setFee(
                    Constants.reduceFee(solutions,
                            Objects.isNull(detail.getDetailServerCost())?
                                    solutions.getPrice():solutions.getPrice().add(detail.getDetailServerCost()),detail.getParentStartTime(),detail.getParentEndTime(),detail.getStartTime(),
                            detail.getEndTime()).subtract(detail.getFee()));
            //如果当前日期 小于 人员保单明细记录的开始时间 则使用开始日期  开始日期 = 结束日期  且 费用全部退回
            if(System.currentTimeMillis()<=detail.getStartTime().getTime()){
                model.setFee(solutions.getPrice().multiply(new BigDecimal(-1)));
            }else{
                Date  reduceEndTime = DateUtil.getMontageDate(
                        DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
                model.setFee(
                        Constants.reduceFee(solutions,
                                Objects.isNull(detail.getDetailServerCost())?solutions.getPrice():solutions.getPrice().add(detail.getDetailServerCost()),
                                insuranceApply.getStartTime(),
                                insuranceApply.getEndTime(),
                                detail.getStartTime(),
                                reduceEndTime).subtract(detail.getFee()));
            }
            index += 1;
        }
        return dataList;
@@ -481,6 +511,13 @@
        if(!loginUserInfo.getType().equals(Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非企业人员无法进行该操作");
        }
        if(Objects.isNull(solutionId)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"参数错误 - 方案信息");
        }
        Solutions solutions = solutionsMapper.selectById(solutionId);
        if(Objects.isNull(solutions)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到方案信息");
        }
        ExcelImporter ie = null;
        List<MemberImport> dataList =null;
        try {
@@ -496,83 +533,111 @@
        Map<String,String> idCardMap = new HashMap<>();
        for(MemberImport model : dataList){
            //校验参数是否合法
            validImportParam(model,idCardMap,dataList,index,solutionId);
            validImportParam(model,idCardMap,dataList,index,solutions);
            index += 1;
        }
        List<DispatchUnit> dispatchUnitList    = dispatchUnitJoinMapper.selectJoinList(DispatchUnit.class,
        List<DispatchUnit> dispatchUnitList = new ArrayList<>();
        List<SolutionWorktype> solutionWorktypeList = new ArrayList<>();
        //2024年11月6日15:39:10 加入 根据方案是否有保险方案进行判断
        if(Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO)){
            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+"  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)
                            .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);
            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);
                }
            }
        }else{
            //方案不选择派遣单位情况下的业务
            solutionWorktypeList = solutionWorktypeJoinMapper.selectJoinList(SolutionWorktype.class,
                    new MPJLambdaWrapper<SolutionWorktype>()
                            .selectAll(SolutionWorktype.class)
                            .selectAs(Worktype::getName,SolutionWorktype::getWorktypeName)
                            .leftJoin(Worktype.class,Worktype::getId,SolutionWorktype::getWorktypeId)
                            .eq(SolutionWorktype::getSolutionId,solutions.getId())
            );
            if(CollectionUtils.isEmpty(solutionWorktypeList)){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，保险方案下未查询到工种信息");
            }
        }
        //String pattern = "^[\\u4e00-\\u9fa5\\d·]+$";
        String pattern = "^[\\u4e00-\\u9fa5·]*$";
        Pattern r = Pattern.compile(pattern);
        index = Constants.TWO;
        for(MemberImport model : dataList){
            //校验人员是否已经在参保中
            isMemberValidForSolution(model,index,solutionId);
            Matcher m = r.matcher(model.getName());
            if (!m.matches()) {
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，"+model.getName() + "姓名无效，请检查后重试");
            }
            //检查派遣单位和工种有效性
            dealDuAndWorktype(model,index,dispatchUnitList);
            dealDuAndWorktype(model,index,dispatchUnitList,solutions,solutionWorktypeList);
            index += 1;
            model.setSex(Constants.getSexByIdCard(model.getIdCard()));
        }
        return dataList;
    }

    private void isMemberValidForSolution(MemberImport model, int index, Integer solutionId) {
       /* ApplyDetail detail = applyDetailJoinMapper.selectJoinOne(ApplyDetail.class,new MPJLambdaWrapper<ApplyDetail>()
                .last("limit 1"));
        if(detail!=null){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行身份证为【"+model.getIdCard()+"】人员已经在该方案下存在投保记录！");
        }*/
    }

    private void dealDuAndWorktype(MemberImport model, int index, List<DispatchUnit> dispatchUnitList  ) {

        if(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());
    private void dealDuAndWorktype(MemberImport model, int index, List<DispatchUnit> dispatchUnitList , Solutions  solutions,List<SolutionWorktype> solutionWorktypeList) {
        //2024年11月6日15:39:10 加入 根据方案是否有保险方案进行判断
        if(Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO)){
            if(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().replaceAll(" ","").equals(model.getWorkTypeName().replaceAll(" ",""))).findFirst();
                        if(worktypeOptional.isPresent()){
                            Worktype worktype = worktypeOptional.get();
                            model.setWorktypeId(worktype.getId());
                        }
                    }
                }
            }
        }
        if(Objects.isNull(model.getDuId())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据派遣单位【"+model.getDuName()+"】不正确！");
            if(Objects.isNull(model.getDuId())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据派遣单位【"+model.getDuName()+"】不正确！");
            }
        }else{
            Optional<SolutionWorktype>  worktypeOptional= solutionWorktypeList.stream().filter(m->m.getWorktypeName().replaceAll(" ","")
                    .equals(model.getWorkTypeName().replaceAll(" ",""))).findFirst();
            if(worktypeOptional.isPresent()){
                SolutionWorktype worktype = worktypeOptional.get();
                model.setWorktypeId(worktype.getId());
            }
        }
        if(Objects.isNull(model.getWorktypeId())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据工种【"+model.getWorkTypeName()+"】不正确！");
        }
    }

    private void validImportParam(MemberImport model, Map<String, String> idCardMap, List<MemberImport> dataList,int index,Integer solutionId) {
    private void validImportParam(MemberImport model, Map<String, String> idCardMap, List<MemberImport> dataList,int index,Solutions solutions) {
        if(StringUtils.isBlank(model.getName())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据姓名不能为空！");
        }
        if(StringUtils.isBlank(model.getIdCard())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据身份证号不能为空！");
        }
        if(StringUtils.isBlank(model.getDuName())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据派遣单位不能为空！");
        //2024年11月6日15:39:10 加入 根据方案是否有保险方案进行判断
        if(Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO)){
            if(StringUtils.isBlank(model.getDuName())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据派遣单位不能为空！");
            }
        }
        if(StringUtils.isBlank(model.getWorkTypeName())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据工种不能为空！");