Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_wzk

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/KPSR.java

@@ -81,6 +81,7 @@ public class KPSR extends FunctionBase implements FreeRefFunction {
                     .andPeriodEqualTo(Integer.valueOf(queryPeriod))
                     .andTaxRateEqualTo(typeMapping.getTaxRate())
                     .andDepartmentEqualTo(typeMapping.getOuName())
+                    .andBillingContentEqualTo(typeMapping.getContent())
                     .andInvoiceTypeEqualTo(InvoiceRecordEnum.InvoiceType.MAPPING.get(billType));
             List<InvoiceRecord> billDetails1 = SpringContextUtil.invoiceRecordMapper.selectByExample(invoiceRecordExample);
             if(CollectionUtils.isNotEmpty(billDetails1)){
@@ -97,6 +98,7 @@ public class KPSR extends FunctionBase implements FreeRefFunction {
                     .andProjectIdEqualTo(formulaContext.getProjectId())
                     .andPeriodEqualTo(Integer.valueOf(queryPeriod))
                     .andTaxRateEqualTo(typeMapping.getTaxRate())
+                    .andBillingContentEqualTo(typeMapping.getContent())
                     .andDepartmentEqualTo(typeMapping.getOuName())
                     .andInvoiceTypeEqualTo(InvoiceRecordEnum.InvoiceType.MAPPING.get(billType));
             List<InvoiceRecord> billDetails2 = SpringContextUtil.invoiceRecordMapper.selectByExample(invoiceRecordExample);