From 3e76171990be40e226341da1cd7c2d159c9a3b70 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 02 二月 2024 18:11:31 +0800 Subject: [PATCH] 111 --- server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java index c744882..f9c781b 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java +++ b/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 -- Gitblit v1.9.3