Merge remote-tracking branch 'origin/master'

jiangping

2024-02-04 6e41324f84f0cf70871ca05292c5420bdcaaa98c

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

@@ -347,6 +347,7 @@
        queryWrapper.selectAll(Taxes.class);
        queryWrapper.selectAs(SystemUser::getRealname,Taxes::getCreatorName);
        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Taxes::getCreator);

        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.eq(Taxes::getIsdeleted, Constants.ZERO);
        Taxes queryModel = pageWrap.getModel();
@@ -375,6 +376,29 @@



    @Override
    public List<Taxes> findListForCompany(Taxes queryModel) {
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        MPJLambdaWrapper<Taxes> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Taxes.class);
        queryWrapper.selectAs(SystemUser::getRealname,Taxes::getCreatorName);
        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Taxes::getCreator);

        queryWrapper.eq(Taxes::getIsdeleted, Constants.ZERO);
        if(!user.getType().equals(Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非企业用户无法进行该业务查询");
        }
        if(!Objects.isNull(queryModel)){
            queryWrapper.ge(queryModel.getStartDate() != null,Taxes::getCreateDate, (queryModel.getStartDate()));
            queryWrapper.le(queryModel.getEndDate() != null,Taxes::getCreateDate,  (queryModel.getEndDate()));
            queryWrapper.eq(!Objects.isNull(queryModel.getInsuranceApplyId()),Taxes::getInsuranceApplyId,queryModel.getInsuranceApplyId());
            queryWrapper.eq(!Objects.isNull(queryModel.getStatus()),Taxes::getStatus,queryModel.getStatus());
        }
        queryWrapper.orderByAsc(Taxes::getCreateDate);
        return taxesJoinMapper.selectJoinList(Taxes.class, queryWrapper);
    }




    @Override