From 3c2e49d7bcc91268a75689db400d1f1698c0f8b7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 16:41:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 a3dee36..a980821 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
@@ -393,6 +393,7 @@
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.exists(!Objects.isNull(queryModel.getApplyId())," select 1 from tax_detial td where td.insurance_apply_id = "+queryModel.getApplyId()+" and t.id = td.tax_id ");
}
queryWrapper.orderByAsc(Taxes::getCreateDate);
@@ -417,7 +418,7 @@
|| Objects.isNull(entrustInvoicingDTO.getInvoicingMoney())
|| Objects.isNull(entrustInvoicingDTO.getType())
|| Objects.isNull(entrustInvoicingDTO.getTaxDetialList())
- || StringUtils.isNotBlank(entrustInvoicingDTO.getAddress())
+ || StringUtils.isBlank(entrustInvoicingDTO.getAddress())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -455,7 +456,7 @@
//鏌ヨ姣忎釜淇濆崟涓嬪彲浠ユ姇淇濈殑閲戦
InsuranceApply insuranceApply = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,new MPJLambdaWrapper<InsuranceApply>()
.selectAll(InsuranceApply.class)
- .select(" ( select sum(td.fee) from taxes ts inner join tax_detial td on ts.TAX_ID = ts.id where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id ) as taxesMoney ")
+ .select(" ifnull(( select sum(td.fee) from taxes ts inner join tax_detial td on td.TAX_ID = ts.id where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id ),0) as taxesMoney ")
.eq(InsuranceApply::getId,taxDetial.getInsuranceApplyId())
);
if(Objects.isNull(insuranceApply)){
--
Gitblit v1.9.3