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

jiangping

2025-06-27 9dc0d681e17d735ff42195a29e6905f4ee9f01da

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

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

/**
@@ -227,50 +229,43 @@
        LoginUserInfo loginUserInfo =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        //企业人员查看本企业数据
        if(loginUserInfo.getType().equals(Constants.ONE)){
            queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
            queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId())
                    .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id  where a.member_id = t.id and b.company_id = "+loginUserInfo.getCompanyId()+"  and b.status in (" +
                            " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
                            " and  a.end_time >= now() ) ", Member::getValidNum )

                    .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id  where a.member_id = t.id and b.company_id = "+loginUserInfo.getCompanyId()+"  and b.status in (" +
                            " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
                            " and a.end_time < now() ) ", Member::getInvalidNum );
        }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.eq(pageWrap.getModel().getCompanyId()!=null,InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId())
                    .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id  where a.member_id = t.id and b.status in (" +
                            " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
                            " and  a.end_time >= now() ) ", Member::getValidNum )
                    .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id  where a.member_id = t.id and b.status in (" +
                            " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
                            " and a.end_time < now() ) ", Member::getInvalidNum );
        }
        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)
                .and(StringUtils.isNotBlank(memberQueryDTO.getKeywords()),
                        i->i.like(Member::getName, memberQueryDTO.getKeywords()).or().like(
                                Member::getIdcardNo,memberQueryDTO.getKeywords()
                        ))
                .eq(Member::getIsdeleted, Constants.ZERO)
//                .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.getIdcardNo()),Member::getIdcardNo, memberQueryDTO.getIdcardNo())
                .like(StringUtils.isNotBlank(memberQueryDTO.getDuName()),DispatchUnit::getName, memberQueryDTO.getDuName())
                .eq(!Objects.isNull(memberQueryDTO.getDuId()),Member::getDuId, memberQueryDTO.getDuId())
                .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")

                .apply(!Objects.isNull(memberQueryDTO.getSolutionsId())," t.id in( select a.member_id from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id  " +
                        "inner join solutions s on b.solution_id = s.id where s.base_id = '"+memberQueryDTO.getSolutionsId()+"' ) ")
        ;
         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));

        Integer sn = 0;
@@ -280,6 +275,7 @@
            if(StringUtils.isNotBlank(member.getIdcardNo())){
                member.setAge(Constants.getAgeByIdCard(member.getIdcardNo()));
            }
            member.setTotalNum(member.getInvalidNum()+member.getValidNum());
        }
        return pageData;
    }
@@ -445,7 +441,10 @@
                            .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)));
                            .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() + "】非在保人员，无法进行该操作");
            }
@@ -570,9 +569,15 @@
                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){
            Matcher m = r.matcher(model.getName());
            if (!m.matches()) {
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，"+model.getName() + "姓名无效，请检查后重试");
            }
            //检查派遣单位和工种有效性
            dealDuAndWorktype(model,index,dispatchUnitList,solutions,solutionWorktypeList);
            index += 1;