From 274d9de5e50cc2d23b25ba271a8e66021b448916 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 23 二月 2024 10:11:54 +0800 Subject: [PATCH] 111 --- server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java | 5 ++++- 1 files changed, 4 insertions(+), 1 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 2cde2ac..be13b91 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 @@ -235,7 +235,9 @@ MPJLambdaWrapper<Taxes> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.selectAll(Taxes.class); queryWrapper.selectAs(Solutions::getName,Taxes::getSolutionName); + queryWrapper.selectAs(SystemUser::getRealname,Taxes::getCancelUserName); queryWrapper.leftJoin(Solutions.class,Solutions::getId,Taxes::getSolutionId); + queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Taxes::getCancelUserId); Taxes model =taxesJoinMapper.selectById(id); if(model==null || !Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){ throw new BusinessException(ResponseStatus.DATA_EMPTY); @@ -648,7 +650,7 @@ taxDetial.setTaxId(taxes.getId()); taxDetial.setTotalFee(taxesInvoicingVO.getAmount()); taxDetial.setFee(taxesInvoicingVO.getAmount()); - taxDetial.setInsuranceApplyId(taxes.getApplyId()); + taxDetial.setInsuranceApplyId(taxes.getInsuranceApplyId()); if(taxesInvoicingVO.getType().equals(Constants.ZERO)){ taxDetial.setType(taxesInvoicingVO.getType()); }else if(taxesInvoicingVO.getType().equals(Constants.ONE)){ @@ -675,6 +677,7 @@ taxDetial.setTotalFee(chTaxes.getPrice()); taxDetial.setFee(chTaxes.getPrice()); taxDetial.setDelTaxId(chTaxes.getId()); + taxDetial.setInsuranceApplyId(taxes.getInsuranceApplyId()); taxDetial.setType(Constants.TWO); taxDetailList.add(taxDetial); } -- Gitblit v1.9.3