diff --git a/dxhy-core/src/main/java/com/dxhy/core/entity/ExtAddTaxInvoice.java b/dxhy-core/src/main/java/com/dxhy/core/entity/ExtAddTaxInvoice.java index 8897e60a..8a57afc3 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/entity/ExtAddTaxInvoice.java +++ b/dxhy-core/src/main/java/com/dxhy/core/entity/ExtAddTaxInvoice.java @@ -273,6 +273,7 @@ public class ExtAddTaxInvoice implements Serializable { private String accountPeriod; private String compCode; private String bzdh; + private String bzr; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/entity/ExtOtherInvoice.java b/dxhy-core/src/main/java/com/dxhy/core/entity/ExtOtherInvoice.java index dde5ba4d..744a63bd 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/entity/ExtOtherInvoice.java +++ b/dxhy-core/src/main/java/com/dxhy/core/entity/ExtOtherInvoice.java @@ -95,4 +95,5 @@ public class ExtOtherInvoice implements Serializable { private String compCode; private String inAccountStatus; private String bzdh; + private String bzr; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/entity/TicketInvoiceModel.java b/dxhy-core/src/main/java/com/dxhy/core/entity/TicketInvoiceModel.java index 361c4f64..8f035f35 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/entity/TicketInvoiceModel.java +++ b/dxhy-core/src/main/java/com/dxhy/core/entity/TicketInvoiceModel.java @@ -113,4 +113,5 @@ public class TicketInvoiceModel implements Serializable { private String imageId; private String accountPeriod; private String compCode; + private String bzr; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java index a990e26a..52199b45 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java @@ -223,4 +223,6 @@ public class FpRzRespVO implements Serializable { private String postingTime; private String accountPeriod; + + private String bzr; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/JkszhcxRespVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/JkszhcxRespVO.java index 4e87426f..70105e90 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/JkszhcxRespVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/JkszhcxRespVO.java @@ -160,4 +160,5 @@ public class JkszhcxRespVO implements Serializable { private String accountPeriod; private String compCode; private String bzdh; + private String bzr; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java index 062e0ed2..b9d9444f 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java @@ -56,7 +56,7 @@ public class CustomsServiceImpl extends MpBaseServiceImpl 0) { for (int i = 0; i < pageList.size(); i++) { JkszhcxRespVO vo = pageList.get(i); - String[] dataArray = new String[36]; + String[] dataArray = new String[37]; // xh dataArray[0] = String.valueOf((curr - 1) * size + i + 1); // 缴款书号码 @@ -134,12 +134,13 @@ public class CustomsServiceImpl extends MpBaseServiceImpl 0) { for (int i = 0; i < pageList.size(); i++) { - String[] dataArray = new String[20]; + String[] dataArray = new String[21]; dataArray[0] = String.valueOf((curr - 1) * size + i + 1); // 发票类型 dataArray[1] = new InvoiceTypeUtils().invoiceTypeName(pageList.get(i).getInvoiceType()); @@ -163,13 +163,14 @@ public class PoolPaperServiceImpl extends MpBaseServiceImpl 0) { for (int i = 0; i < pageList.size(); i++) { - String[] dataArray = new String[39]; + String[] dataArray = new String[40]; dataArray[0] = String.valueOf((curr - 1) * size + i + 1); // 发票类型 dataArray[1] = new InvoiceTypeUtils().invoiceTypeName(pageList.get(i).getInvoiceType()); @@ -325,13 +326,14 @@ public class PoolPaperServiceImpl extends MpBaseServiceImpl{}",pageList.get(i).getInAccountStatus()); if (pageList.get(i).getInAccountStatus() != null && "1".equals(pageList.get(i).getInAccountStatus())){ - dataArray[35] = "已入账"; + dataArray[36] = "已入账"; }else { - dataArray[35] = "未入账"; + dataArray[36] = "未入账"; } - dataArray[36] = pageList.get(i).getCompCode(); + dataArray[37] = pageList.get(i).getCompCode(); returnList.add(dataArray); } } @@ -363,7 +365,7 @@ public class PoolPaperServiceImpl extends MpBaseServiceImpl 0) { for (int i = 0; i < pageList.size(); i++) { - String[] dataArray = new String[33]; + String[] dataArray = new String[34]; dataArray[0] = String.valueOf((curr - 1) * size + i + 1); // 发票类型 dataArray[1] = new InvoiceTypeUtils().invoiceTypeName(pageList.get(i).getInvoiceType()); @@ -424,12 +426,13 @@ public class PoolPaperServiceImpl extends MpBaseServiceImpl List returnList = new ArrayList<>(); if (resultList != null && resultList.size() > 0) { for (int i = 0; i < pageList.size(); i++) { - String[] dataArray = new String[21]; + String[] dataArray = new String[23]; dataArray[0] = String.valueOf((curr - 1) * size + i + 1); dataArray[1] = pageList.get(i).getInvoiceCode(); dataArray[2] = pageList.get(i).getInvoiceNo(); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/TicketServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/TicketServiceImpl.java index 2b114977..2e0ebb2a 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/TicketServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/TicketServiceImpl.java @@ -137,7 +137,7 @@ public class TicketServiceImpl extends MpBaseServiceImpl companyCodes = companyCodeArray.toJavaList(String.class); @@ -155,6 +157,8 @@ public class CustomExportThread extends BaseThread { pramsMap.put("keyWord", prams.getString("keyWord")); pramsMap.put("companyCode",companyCode); pramsMap.put("companyCodes",companyCodes); + pramsMap.put("bzdh",bzdh); + pramsMap.put("bzr",bzr); List gfshList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { 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 8c618d54..bdce21d8 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 @@ -66,7 +66,7 @@ public class ManualAthensThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = {"序号", "发票代码", "发票号码", "发票类型","发票状态", "开票日期","购方名称", "销方名称", "金额", "税额", - "抵扣税额", "签收状态", "签收日期", "签收方式", "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号", "所属组织"}; + "抵扣税额", "签收状态", "签收日期", "签收方式", "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号","报账人", "所属组织"}; /** * 导出excel的列名 @@ -131,6 +131,7 @@ public class ManualAthensThread extends BaseThread { JSONObject prams = JSONObject.parseObject(condition); String businessCode = prams.getString("businessCode"); String bzdh = prams.getString("bzdh"); + String bzr = prams.getString("bzr"); String company = prams.getString("company"); String companyCode = prams.getString("companyCode"); String keyWord = prams.getString("keyWord"); @@ -153,6 +154,9 @@ public class ManualAthensThread extends BaseThread { // 参数转换为需要的形式 Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", dbName); + pramsMap.put("bzdh",bzdh); + pramsMap.put("bzr",bzr); + pramsMap.put("businessCode",businessCode); List gfshList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { gfshList = StringHelper.stringToList(gfsh); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java index aeee2e20..8da04937 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java @@ -68,7 +68,7 @@ public class PoolAddTaxThread extends BaseThread { */ private final String[] titleColumns = {"序号", "发票类型", "发票代码", "发票号码", "发票状态", "开票日期", "销方名称", "销方税号", "金额", "税额", "有效税额", "价税合计", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人", - "入账月份", "是否末次摊销", "摊销金额", "剩余金额", "业务单号", "入池时间","凭证号","过账时间","账期","影像号","报账单号","入账状态","所属组织"}; + "入账月份", "是否末次摊销", "摊销金额", "剩余金额", "业务单号", "入池时间","凭证号","过账时间","账期","影像号","报账单号","报账人","入账状态","所属组织"}; /** * 导出excel的列名 @@ -147,12 +147,16 @@ public class PoolAddTaxThread extends BaseThread { String inAccountStatus = prams.getString("inAccountStatus"); String inAccountMonth = prams.getString("inAccountMonth"); String company = prams.getString("company"); + String bzdh = prams.getString("bzdh"); + String bzr = prams.getString("bzr"); String companyCode = prams.getString("companyCode"); JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); List companyCodes = companyCodeArray.toJavaList(String.class); // 参数转换为需要的形式 Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", dbName); + pramsMap.put("bzdh",bzdh); + pramsMap.put("bzr",bzr); List gfshList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { gfshList = StringHelper.stringToList(gfsh); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java index 4ec66616..5baa3d53 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java @@ -55,7 +55,8 @@ public class PoolOtherThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = - {"序号", "发票类型", "发票代码", "发票号码", "开票日期", "金额", "签收状态", "签收日期", "签收方式", "签收人", "业务单号", "入池时间","凭证号", "过账时间", "影像号", "账期","报账单号","入账状态","所属组织"}; + {"序号", "发票类型", "发票代码", "发票号码", "开票日期", "金额", "签收状态", "签收日期", "签收方式", "签收人", "业务单号", + "入池时间","凭证号", "过账时间", "影像号", "账期","报账单号","报账人","入账状态","所属组织"}; private final IExcelExportlogService exportLogService; @@ -119,9 +120,15 @@ public class PoolOtherThread extends BaseThread { String invoiceType = prams.getString("invoiceType"); String gfTaxNo = prams.getString("gfTaxNo"); String company = prams.getString("company"); + String bzr = prams.getString("bzr"); + String bzdh = prams.getString("bzdh"); + String inAccountStatus = prams.getString("inAccountStatus"); // 参数转换为需要的形式 Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", dbName); + pramsMap.put("bzr",bzr); + pramsMap.put("bzdh",bzdh); + pramsMap.put("inAccountStatus",inAccountStatus); List gfshList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { gfshList = StringHelper.stringToList(gfsh); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java index aab726a2..0408d461 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java @@ -73,7 +73,7 @@ public class PoolSaleThread extends BaseThread { private final String[] titleColumns = {"序号", "发票类型", "发票代码", "发票号码", "发票状态", "开票日期", "购方名称", "购方税号", "金额", "税额", "价税合计", "清单标志", "备注", "优惠政策类型", "采集状态", "采集时间", "采集来源", "签收方式", "对接系统", "签收状态", "签收日期", "签收人", "入账月份", "凭证号", "业务单号", - "入池时间","影像号","账期","过账日期","报账单号","入账状态","所属组织"}; + "入池时间","影像号","账期","过账日期","报账单号","报账人","入账状态","所属组织"}; /** * 导出excel的列名 @@ -151,6 +151,8 @@ public class PoolSaleThread extends BaseThread { String inAccountMonth = prams.getString("inAccountMonth"); String inAccountStatus = prams.getString("inAccountStatus"); String gfTaxNo = prams.getString("gfTaxNo"); + String bzdh = prams.getString("bzdh"); + String bzr = prams.getString("bzr"); String company = prams.getString("company"); String companyCode = prams.getString("companyCode"); JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); @@ -158,6 +160,8 @@ public class PoolSaleThread extends BaseThread { // 参数转换为需要的形式 Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", dbName); + pramsMap.put("bzdh",bzdh); + pramsMap.put("bzr",bzr); List gfshList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { gfshList = StringHelper.stringToList(gfsh); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java index a36eaad6..135feb8d 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java @@ -61,7 +61,8 @@ public class QypcsmkpExportThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = {"序号", "发票类型", "发票代码", "发票号码", "开票日期", "销方名称", "乘坐人", "证件号", "班次/车次", "金额", - "税率(%)", "税额", "签收状态", "签收日期", "签收方式", "签收人", "抵扣状态", "业务单号", "入池时间","凭证号", "过账时间", "影像号", "账期","报账单号","入账状态","所属组织"}; + "税率(%)", "税额", "签收状态", "签收日期", "签收方式", "签收人", "抵扣状态", "业务单号", "入池时间","凭证号", "过账时间", "影像号", + "账期","报账单号","报账人","入账状态","所属组织"}; private final IExcelExportlogService exportLogService; diff --git a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml index a4e1af07..7177b273 100644 --- a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml +++ b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml @@ -34,6 +34,7 @@ + @@ -44,7 +45,7 @@ fill_in_date,t.gf_tax_no,t.gf_name,t.tax_amount,t.yx_tax_amount,t.audit_status,t.apply_check,t.check_status,t.qs_status, DATE_FORMAT(t.qs_date,'%Y-%m-%d') qs_date,t.qs_type,t.qs_user,DATE_FORMAT(t.rzh_date,'%Y-%m-%d') rzh_date, t.rzh_yesorno,t.sn_voucher_number snVoucherName,t.posting_time,t.image_id imageId, - t.account_period accountPeriod,t.auth_status,t.bdk_status,t.confirm_user,t.rzh_belong_date,t.glzt,t.inaccount_status,t.bzdh,t.comp_code, + t.account_period accountPeriod,t.auth_status,t.bdk_status,t.confirm_user,t.rzh_belong_date,t.glzt,t.inaccount_status,t.bzdh,t.comp_code,t.bzr, t.customs_scan_id,t.dept_name businessName,t.in_account_status,t.voucher_number,t.document_number,t.in_account_date,rzh_type,rzlx,t.create_date, data_sources from t_dx_customs_record t diff --git a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml index 3db2a63e..037cff7a 100644 --- a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml +++ b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml @@ -103,6 +103,7 @@ select_id selectId, business_document_number businessDocumentNumber, bzdh, + bzr, inaccount_status inAccountStatus, comp_code compCode FROM @@ -161,6 +162,9 @@ and bzdh = #{bzdh} + + and bzr like concat('%',#{bzr},'%') + and (comp_code in @@ -273,6 +277,7 @@ DATE_FORMAT(t.collect_date,'%Y-%m-%d') collectDate, t.collect_from collectFrom, t.bzdh bzdh, + t.bzr bzr, t.inaccount_status inAccountStatus, t.comp_code compCode from t_dx_record_invoice t @@ -340,6 +345,9 @@ and t.bzdh = #{bzdh} + + and t.bzr like concat('%',#{bzr},'%') + and t.sn_voucher_number = #{snVoucherNumber} @@ -376,6 +384,7 @@ ,t.sn_voucher_number snVoucherNumber ,t.system_name systemName ,t.bzdh + ,t.bzr ,t.inaccount_status inAccountStatus ,t.comp_code compCode from t_dx_sale_record_invoice t @@ -437,6 +446,10 @@ and t.bzdh = #{bzdh} + + and t.bzr like concat('%',#{bzr},'%') + + and t.account_period = #{accountPeriod} diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 012f5cbd..9d463de6 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -485,6 +485,7 @@ +