diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index fe52add2..d753f16e 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -139,9 +139,11 @@ public class BaseInvoiceController extends AbstractController { int curr = (int)map.get("curr"); int size = (int)map.get("size"); String bzdh = (String) map.get("bzdh"); + String bzr = (String) map.get("bzr"); Map pramsMap = new HashMap<>(25); pramsMap.put("bzdh", bzdh); + pramsMap.put("bzr",bzr); pramsMap.put("inAccountStatus", inAccountStatus); pramsMap.put("qszt", map.get("qszt")); pramsMap.put("wrzfpStart", map.get("wrzfpStart")); diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java index a2ede5aa..ed2660ec 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java +++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java @@ -210,5 +210,7 @@ public class BaseFpRzRespVO implements Serializable { //组织编码 private String compCode; + private String bzr; + } diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 5b855cef..78362e02 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -43,6 +43,7 @@ + @@ -66,7 +67,7 @@ t.dept_id deptId,t.dept_name deptName,t.comp_code, t.xf_tax_no,t.xf_name,t.tax_amount,t.dk_tax_amount,t.invoice_status,t.invoice_amount,date_format(t.rzh_date,'%Y-%m-%d') rzh_date, date_format(t.qs_date,'%Y-%m-%d') qs_date,t.rzh_type,t.id id, - t.gx_user_name,t.rzh_belong_date,t.inaccount_status,t.bzdh, + t.gx_user_name,t.rzh_belong_date,t.inaccount_status,t.bzdh,t.bzr, t.rzh_belong_date as dqskssq,t.auth_status,t.qs_type,t.qs_status,t.confirm_user,t.qs_name,t.rzh_yesorno,t.cxrz_status,t.out_status, t.bdk_status,t.bdk_current_period,date_format(t.bdk_date,'%Y-%m-%d') bdk_date,t.rzh_back_msg,t.in_account_status,t.payment_status,date_format(t.payment_date,'%Y-%m-%d')payment_date, @@ -99,6 +100,9 @@ and t.bzdh = #{bzdh} + + and t.bzr like concat('%',#{bzr},'%') + and t.inaccount_status = #{inAccountStatus} @@ -373,6 +377,9 @@ and t.bzdh = #{bzdh} + + and t.bzr like concat('%',#{bzr},'%') + and t.inaccount_status = #{inAccountStatus} diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index 5c15a8b3..62694d9e 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -107,16 +107,16 @@ and (t.comp_code = '' or t.comp_code is null) - t.suspend_status = '1' + and t.suspend_status = '1' - t.suspend_status = '' or t.suspend_status is null or t.suspend_status = '0' + and t.suspend_status = '' or t.suspend_status is null or t.suspend_status = '0' - t.suspend_date = #{suspendDate} + and t.suspend_date = #{suspendDate} - t.bzr like concat('%',#{bzr},'%') + and t.bzr like concat('%',#{bzr},'%') and t.qs_status = #{qszt} @@ -423,16 +423,16 @@ and t.qs_status = #{qszt} - t.suspend_status = '1' + and t.suspend_status = '1' - t.suspend_status = '' or t.suspend_status is null or t.suspend_status = '0' + and t.suspend_status = '' or t.suspend_status is null or t.suspend_status = '0' - t.suspend_date = #{suspendDate} + and t.suspend_date = #{suspendDate} - t.bzr like cancat('%',#{bzr},'%') + and t.bzr like cancat('%',#{bzr},'%') diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java index 6b149d35..d9456436 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java @@ -215,6 +215,7 @@ public class ExtFpzhcxController extends AbstractController { data.put("dbName", getUserInfo().getDbName()); data.put("business", getUserInfo().getBusiness()); data.put("bzdh",pramsMap.get("bzdh")); + data.put("bzr",pramsMap.get("bzr")); data.put("inAccountStatus",pramsMap.get("inAccountStatus")); List gfshList = new ArrayList<>(); if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) { diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java index 3641de70..666dddcd 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java @@ -141,4 +141,5 @@ public class ExtAddTaxInvoice implements Serializable { private String accountPeriod; private String compCode; private String bzdh; + private String bzr; } diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java index 47e9ec2e..b49cf9a3 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java @@ -72,4 +72,5 @@ public class ExtOtherInvoice implements Serializable { private String bzdh; private String snVoucherNumber; private String compCode; + private String bzr; } diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtTicketInvoiceModel.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtTicketInvoiceModel.java index fc00ba63..a35a9661 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtTicketInvoiceModel.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtTicketInvoiceModel.java @@ -110,6 +110,7 @@ public class ExtTicketInvoiceModel implements Serializable { private String bzdh; @TableField("inaccount_status") private String inAccountStatus; + private String bzr; } diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbfpzhcxRespVO.java b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbfpzhcxRespVO.java index 82d6696c..2e85538d 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbfpzhcxRespVO.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbfpzhcxRespVO.java @@ -188,6 +188,7 @@ public class ExtBbfpzhcxRespVO implements Serializable { private String accountPeriod; private String compCode; private String bzdh; + private String bzr; public ExtBbfpzhcxRespVO() {} diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java index 4491d1a0..1da336e6 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java @@ -114,6 +114,7 @@ public class ExtBbycfpcxRespVO implements Serializable { private String imageNumber; private String accountPeriod; private String postingTime; + private String bzr; public ExtBbycfpcxRespVO() {} diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java index dd6beeba..295faef6 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java @@ -45,12 +45,12 @@ public class TicketServiceImpl extends MpBaseServiceImpl + @@ -58,7 +59,7 @@ resultMap="BaseResultMap" databaseId="mysql"> select t.invoice_code,t.invoice_no,DATE_FORMAT(t.invoice_date,'%Y-%m-%d') kprq,t.gf_tax_no - gfsh,t.gf_name gfmc, + gfsh,t.gf_name gfmc,t.bzr, t.xf_tax_no,t.xf_name,t.tax_amount,t.dk_tax_amount,t.invoice_status,t.invoice_amount,DATE_FORMAT(t.rzh_date,'%Y-%m-%d') rzh_date ,DATE_FORMAT(t.qs_date,'%Y-%m-%d') qs_date,t.rzh_type,t.dept_id deptId, t.gx_user_name,t.rzh_belong_date @@ -76,6 +77,9 @@ and t.bzdh = #{bzdh} + + and t.bzr like concat('%',#{bzr},'%') + and t.inaccount_status = #{inAccountStatus} @@ -335,6 +339,9 @@ and t.bzdh = #{bzdh} + + and t.bzr like concat('%',#{bzr},'%') + and t.in_account_status = #{inAccountStatus} diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml index 57fe13d9..05efa5e4 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml @@ -7,6 +7,7 @@ type="com.dxhy.extend.model.ExtBbycfpcxRespVO"> + @@ -47,7 +48,7 @@ t.invoice_code fpdm, t.invoice_no fphm ,DATE_FORMAT(t.invoice_date,'%Y-%m-%d') kprq,t.gf_tax_no gfsh,t.gf_name gfmc,t.invoice_type invoiceType, t.xf_tax_no xfsh,t.xf_name xfmc,t.tax_amount se,t.invoice_amount - je,DATE_FORMAT(t.qs_date,'%Y-%m-%d') qsrq,t.inaccount_status,t.bzdh, + je,DATE_FORMAT(t.qs_date,'%Y-%m-%d') qsrq,t.inaccount_status,t.bzdh,t.bzr, t.qs_status qszt,t.qs_name qsr, t.invoice_status yczt,DATE_FORMAT(t.status_update_date,'%Y-%m-%d') ycsj,rzh_date rzsj,t.sn_voucher_number,t.account_period,t.posting_time,t.image_id, @@ -64,6 +65,9 @@ and t.bzdh = #{bzdh} + + and t.bzr like concat('%',#{bzr},'%') + and t.inaccount_status = #{inAccountStatus} @@ -183,6 +187,9 @@ and t.bzdh = #{bzdh} + + and t.bzr like concat('%',#{bzr},'%') + and t.inaccount_status = #{inAccountStatus} diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 4aa5874f..2b5e66c5 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -127,6 +127,9 @@ and t.bzdh = #{bzdh} + + and t.bzr like concat('%',#{bzr},'%') + and t.sn_voucher_number = #{snVoucherNumber} @@ -197,6 +200,7 @@ t.account_period accountPeriod, t.inaccount_status inAccountStatus, t.bzdh bzdh, + t.bzr bzr, t.posting_time postingTime, DATE_FORMAT(t.collect_date,'%Y-%m-%d') collectDate, t.collect_from collectFrom, @@ -272,6 +276,9 @@ and t.bzdh = #{bzdh} + + and t.bzr like concat('%',#{bzr},'%') + and t.sn_voucher_number = #{snVoucherNumber} @@ -358,6 +365,9 @@ and bzdh = #{bzdh} + + and bzr like concat('%',#{bzr},'%') + and sn_voucher_number = #{snVoucherNumber} @@ -399,6 +409,7 @@ posting_time postingTime, inaccount_status inAccountStatus, bzdh bzdh, + bzr bzr, sn_voucher_number snVoucherNumber, comp_code compCode FROM @@ -458,6 +469,9 @@ and bzdh = #{bzdh} + + and bzr like concat('%',#{bzr},'%') + and (comp_code in @@ -560,6 +574,9 @@ and t.bzdh = #{bzdh} + + and t.bzr like concat('%',#{bzr},'%') + and (t.comp_code in @@ -588,6 +605,7 @@ ,t.posting_time postingTime ,t.inaccount_status inAccountStatus ,t.bzdh bzdh + ,t.bzr bzr ,t.comp_code compCode from t_dx_sale_record_invoice t where 1 = 1 @@ -672,6 +690,9 @@ and t.bzdh = #{bzdh} + + and t.bzr like concat('%',#{bzr},'%') + and (t.comp_code in diff --git a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml index 4398774c..e5a59d3c 100644 --- a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml @@ -72,6 +72,9 @@ and t.bzdh = #{bzdh} + + and bzr like concat('%',#{bzr},'%') + and t.sn_voucher_number = #{snVoucherNumber} @@ -153,6 +156,9 @@ and t.bzdh = #{bzdh} + + and bzr like concat('%',#{bzr},'%') + and t.sn_voucher_number = #{snVoucherNumber}