Skip to content

T
traffic-front
Commit 1986138d authored by chase's avatar chase
Browse files
Options

fix KPSR bug

parent 28fc699e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/KPSR.java
View file @ 1986138d
...@@ -81,6 +81,7 @@ public class KPSR extends FunctionBase implements FreeRefFunction { ...@@ -81,6 +81,7 @@ public class KPSR extends FunctionBase implements FreeRefFunction {
.andPeriodEqualTo(Integer.valueOf(queryPeriod)) .andPeriodEqualTo(Integer.valueOf(queryPeriod))
.andTaxRateEqualTo(typeMapping.getTaxRate()) .andTaxRateEqualTo(typeMapping.getTaxRate())
.andDepartmentEqualTo(typeMapping.getOuName()) .andDepartmentEqualTo(typeMapping.getOuName())
.andBillingContentEqualTo(typeMapping.getContent())
.andInvoiceTypeEqualTo(InvoiceRecordEnum.InvoiceType.MAPPING.get(billType)); .andInvoiceTypeEqualTo(InvoiceRecordEnum.InvoiceType.MAPPING.get(billType));
List<InvoiceRecord> billDetails1 = SpringContextUtil.invoiceRecordMapper.selectByExample(invoiceRecordExample); List<InvoiceRecord> billDetails1 = SpringContextUtil.invoiceRecordMapper.selectByExample(invoiceRecordExample);
if(CollectionUtils.isNotEmpty(billDetails1)){ if(CollectionUtils.isNotEmpty(billDetails1)){
...@@ -97,6 +98,7 @@ public class KPSR extends FunctionBase implements FreeRefFunction { ...@@ -97,6 +98,7 @@ public class KPSR extends FunctionBase implements FreeRefFunction {
.andProjectIdEqualTo(formulaContext.getProjectId()) .andProjectIdEqualTo(formulaContext.getProjectId())
.andPeriodEqualTo(Integer.valueOf(queryPeriod)) .andPeriodEqualTo(Integer.valueOf(queryPeriod))
.andTaxRateEqualTo(typeMapping.getTaxRate()) .andTaxRateEqualTo(typeMapping.getTaxRate())
.andBillingContentEqualTo(typeMapping.getContent())
.andDepartmentEqualTo(typeMapping.getOuName()) .andDepartmentEqualTo(typeMapping.getOuName())
.andInvoiceTypeEqualTo(InvoiceRecordEnum.InvoiceType.MAPPING.get(billType)); .andInvoiceTypeEqualTo(InvoiceRecordEnum.InvoiceType.MAPPING.get(billType));
List<InvoiceRecord> billDetails2 = SpringContextUtil.invoiceRecordMapper.selectByExample(invoiceRecordExample); List<InvoiceRecord> billDetails2 = SpringContextUtil.invoiceRecordMapper.selectByExample(invoiceRecordExample);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment