diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java index c6477147..67f3d18f 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java @@ -249,14 +249,17 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl taxList = new ArrayList<>(); List orgList = new ArrayList<>(); List dkList = new ArrayList<>(); @@ -267,6 +270,11 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl curMap = new HashMap<>(); List shList = new ArrayList<>(); shList.add(recordInvoice.getGfTaxNo()); @@ -390,6 +398,9 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl - and (t.comp_code in + and t.comp_code in #{companyCode} - or t.comp_code is null or t.comp_code = '' - ) + and t.comp_code = #{companyCode} @@ -136,6 +135,9 @@ and t.bzdh = #{bzdh} + + and t.bzdh is not null and t.inaccount_status = '1' + and t.inaccount_status = #{inAccountStatus} @@ -509,6 +511,9 @@ and t.bzdh = #{bzdh} + + and t.bzdh is not null + and t.inaccount_status = #{inAccountStatus} diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java index ada14005..a75f41a0 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java @@ -140,6 +140,7 @@ public class ManualAthensThread extends BaseThread { String gfsh = prams.getString("gfsh"); String fpzt = prams.getString("invoiceStatus"); String invoiceType = prams.getString("invoiceType"); + String invoiceNo = prams.getString("invoiceNo"); String qszt = prams.getString("qszt"); String qsr = prams.getString("qsr"); String qsfs = prams.getString("qsfs"); @@ -224,6 +225,7 @@ public class ManualAthensThread extends BaseThread { pramsMap.put("inAccountStatus", inAccountStatus); pramsMap.put("company", company); pramsMap.put("invoiceSource",prams.getString("invoiceSource")); + pramsMap.put("invoiceNo",invoiceNo); pramsMap.put("companyCodes",companyCodes); pramsMap.put("companyCode",companyCode); pramsMap.put("snVoucherNumber", prams.getString("snVoucherNumber")); diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 28250108..b6d768b3 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -605,14 +605,12 @@ - and (t.comp_code in + and t.comp_code in #{companyCode} - or t.comp_code is null or t.comp_code = '' - ) - + and t.comp_code = #{companyCode}