From f8b1073fbb28d37e08016eed32c682f8c5eae391 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 02 二月 2024 17:26:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 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 f3fa62b..c744882 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 @@ -129,11 +129,12 @@ private List<TaxDetial> getJoinDetailListById(Integer id) { MPJLambdaWrapper<TaxDetial> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.selectAll(TaxDetial.class); + queryWrapper.selectAs(Solutions::getName,TaxDetial::getSolutionName); queryWrapper.selectAs(Taxes::getDoneCode,TaxDetial::getTaxDoneCode); queryWrapper.selectAs(Taxes::getCreateDate,TaxDetial::getTaxCreateDate); queryWrapper.selectAs(InsuranceApply::getCode,TaxDetial::getApplyCode); - queryWrapper.selectAs(ApplyChange::getCode,TaxDetial::getChangApplyCode); - queryWrapper.select("(CASE t.type\n" + + queryWrapper.selectAs(ApplyChange::getValidCode,TaxDetial::getChangApplyCode); +/* queryWrapper.select("(CASE t.type\n" + "WHEN 0 THEN (select count(1) from apply_detail c where c.APPLY_ID=t.INSURANCE_APPLY_ID) \n" + "ELSE 0 \n" + "END) as applyNum,\n" + @@ -144,10 +145,12 @@ "(CASE t.type \n" + "WHEN 1 THEN (select count(1) from apply_chagne_detail c where c.APPLY_CHANGE_ID=t.APPLY_CHANGE_ID) \n" + "ELSE 0 \n" + - "END) as applyChangeAddNum"); + "END) as applyChangeAddNum");*/ queryWrapper.leftJoin(InsuranceApply.class,InsuranceApply::getId,TaxDetial::getInsuranceApplyId); + queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId); queryWrapper.leftJoin(ApplyChange.class,ApplyChange::getId,TaxDetial::getApplyChangeId); queryWrapper.leftJoin(Taxes.class,Taxes::getId,TaxDetial::getDelTaxId); + queryWrapper.eq( TaxDetial::getTaxId,id); List<TaxDetial> detialList = taxDetailJoinMapper.selectJoinList(TaxDetial.class,queryWrapper.orderByAsc(TaxDetial::getType)); @@ -246,11 +249,12 @@ List<TaxDetial> applyList = new ArrayList<>();//鎶曚繚鍜屽姞鍑忎繚 List<TaxDetial> delList = new ArrayList<>();//鍐茬孩鍗� if(detialList!=null){ - for(TaxDetial d :delList){ - d.setSolutionName(model.getSolutionName()); + for(TaxDetial d :detialList){ +// d.setSolutionName(model.getSolutionName()); d.setFee(Constants.formatBigdecimal(d.getFee())); d.setTotalFee(Constants.formatBigdecimal(d.getTotalFee())); - if(Constants.equalsInteger(d.getType(),Constants.ZERO) || Constants.equalsInteger(d.getType(),Constants.ONE)){ + if(Constants.equalsInteger(d.getType(),Constants.ZERO) + || Constants.equalsInteger(d.getType(),Constants.ONE)){ applyList.add(d); }else if(Constants.equalsInteger(d.getType(),Constants.TWO)){ delList.add(d); -- Gitblit v1.9.3