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

jiangping

2024-06-21 69c2b50ded530c6bc003c6ddbeaca786d7823270

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

@@ -312,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)
@@ -339,7 +342,9 @@
                    .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);
@@ -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());