添加报账人字段

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<String, Object> 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"));

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;
+
 
 }

dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml

@@ -43,6 +43,7 @@
         <result column="bdk_current_period" property="bdkCurrentPeriod"/>
         <result column="bdk_date" property="bdkDate"/>
         <result column="bzdh" property="bzdh"/>
+        <result column="bzr" property="bzr"/>
         <result column="inaccount_status" property="inAccountStatus"/>
         <result column="payment_date" property="paymentDate"/>
         <result column="payment_status" property="paymentStatus"/>
@@ -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 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and t.bzr like concat('%',#{bzr},'%')
+        </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
             and t.inaccount_status = #{inAccountStatus}
         </if>
@@ -373,6 +377,9 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
             and t.bzdh = #{bzdh}
         </if>
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and t.bzr like concat('%',#{bzr},'%')
+        </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
             and t.inaccount_status = #{inAccountStatus}
         </if>

dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml

@@ -107,16 +107,16 @@
             and (t.comp_code = '' or t.comp_code is null)
         </if>
         <if test="suspendStatus != null and suspendStatus != '' and suspendStatus != 'null' and suspendStatus != '99' and suspendStatus == '1'.toString()">
-            t.suspend_status = '1'
+            and t.suspend_status = '1'
         </if>
         <if test="suspendStatus != null and suspendStatus != '' and suspendStatus != 'null' and suspendStatus != '99' and suspendStatus == '0'.toString()">
-            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'
         </if>
         <if test="suspendDate != null and suspendDate != '' and suspendDate != 'null' ">
-            t.suspend_date = #{suspendDate}
+            and t.suspend_date = #{suspendDate}
         </if>
         <if test="bzr != null and bzr != '' and bzr != 'null'">
-            t.bzr like concat('%',#{bzr},'%')
+            and t.bzr like concat('%',#{bzr},'%')
         </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' ">
             and t.qs_status = #{qszt}
@@ -423,16 +423,16 @@
             and t.qs_status = #{qszt}
         </if>
         <if test="suspendStatus != null and suspendStatus != '' and suspendStatus != 'null' and suspendStatus != '99' and suspendStatus == '1'.toString()">
-            t.suspend_status = '1'
+            and t.suspend_status = '1'
         </if>
         <if test="suspendStatus != null and suspendStatus != '' and suspendStatus != 'null' and suspendStatus != '99' and suspendStatus == '0'.toString()">
-            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'
         </if>
         <if test="suspendDate != null and suspendDate != '' and suspendDate != 'null' ">
-            t.suspend_date = #{suspendDate}
+            and t.suspend_date = #{suspendDate}
         </if>
         <if test="bzr != null and bzr != '' and bzr != 'null'">
-            t.bzr like cancat('%',#{bzr},'%')
+            and t.bzr like cancat('%',#{bzr},'%')
         </if>
         <if
                 test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">

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<String> gfshList = new ArrayList<>();
         if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) {

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;
 }

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;
 }

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;
 
 
 }

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() {}
 

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() {}
 

dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java

@@ -45,12 +45,12 @@ public class TicketServiceImpl extends MpBaseServiceImpl<ExtTicketDao, ExtTicket
         try {
             String[] titlelist = {"序号", "发票类型", "发票代码", "发票号码", "开票日期", "销方名称", "乘坐人", "证件号", "班次/车次", "金额",
                 "签收状态", "签收日期", "签收方式", "签收人", "抵扣状态", "业务单号", "入池时间","凭证号", "过账时间", "影像号",
-                    "账期","报账单号","入账状态","所属组织"};
+                    "账期","报账单号","报账人","入账状态","所属组织"};
 
             String[] titleprop = {"xh", "invoiceTypeString", "invoiceCode", "invoiceNo", "invoiceDate", "xfName",
                 "passenger", "passengerSfzh", "trainNumber", "invoiceAmount", "qsStatus",
                 "qsDate", "qsType", "qsName", "isDeduction", "businessDocumentNumber", "createDate","snVoucherNumber",
-                    "postingTime","imageId","accountPeriod","bzdh","inAccountStatus","compCode"};
+                    "postingTime","imageId","accountPeriod","bzdh","bzr","inAccountStatus","compCode"};
             // 需要设置返回列表标题时调用
             json = super.setTitleList(titlelist, titleprop);
             PageHelper.startPage(curr, size);

dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java

@@ -49,13 +49,13 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
         try {
             String[] titlelist = {"序号", "发票类型", "发票代码", "发票号码", "发票状态", "开票日期", "销方名称", "销方税号", "金额", "税额", "有效税额",
                 "价税合计", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人",
-                "入账月份", "凭证号", "过账时间", "影像号", "账期","是否末次摊销", "摊销金额", "剩余金额", "业务单号", "入池时间","报账单号","入账状态","所属组织"};
+                "入账月份", "凭证号", "过账时间", "影像号", "账期","是否末次摊销", "摊销金额", "剩余金额", "业务单号", "入池时间","报账单号","报账人","入账状态","所属组织"};
 
             String[] titleprop = {"xh", "invoiceType", "invoiceCode", "invoiceNo", "invoiceStatus", "invoiceDate",
                 "xfmc", "xfsh", "invoiceAmount", "taxAmount", "yxse", "totalAmount", "rzzt", "rzlx", "rzrq", "rzfs",
                 "rzr", "collectStatus", "collectDate", "collectFrom", "qsfs", "qszt", "qsrq", "qsr", "inAccountMonth",
                  "snVoucherNumber","postingTime","imageNumber","accountPeriod", "amortizeStatus", "amortizeAmount", "remainAmortizeAmount",
-                "documentNumber", "createDate","bzdh","inAccountStatus","compCode"};
+                "documentNumber", "createDate","bzdh","bzr","inAccountStatus","compCode"};
             // 需要设置返回列表标题时调用
             json = super.setTitleList(titlelist, titleprop);
             PageHelper.startPage(curr, size);
@@ -217,10 +217,10 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
         try {
             String[] titlelist =
                 {"序号", "发票类型", "发票代码", "发票号码", "开票日期", "金额", "签收状态", "签收日期", "签收方式", "签收人", "业务单号"
-                        , "入池时间","凭证号", "过账时间", "影像号", "账期","报账单号","入账状态","所属组织"};
+                        , "入池时间","凭证号", "过账时间", "影像号", "账期","报账单号","报账人","入账状态","所属组织"};
             String[] titleprop = {"xh", "invoiceTypeString", "invoiceCode", "invoiceNo", "invoiceDate", "invoiceAmount",
                 "qszt", "qsrq", "qsfs", "qsr", "businessDocumentNumber", "createDate","snVoucherNumber", "postingTime",
-                    "imageNumber","accountPeriod","bzdh","inAccountStatus","compCode"};
+                    "imageNumber","accountPeriod","bzdh","bzr","inAccountStatus","compCode"};
             // 需要设置返回列表标题时调用
             json = super.setTitleList(titlelist, titleprop);
             PageHelper.startPage(curr, size);
@@ -310,13 +310,13 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
         try {
             String[] titlelist = {"序号", "发票类型", "发票代码", "发票号码", "发票状态", "开票日期", "购方名称", "购方税号", "金额", "税额", "价税合计",
                 "清单标志", "备注", "优惠政策类型", "采集状态", "采集时间", "采集来源", "签收方式", "对接系统", "签收状态", "签收日期", "签收人", "入账月份",
-                "凭证号", "业务单号", "入池时间","影像号","账期","过账日期","报账单号","入账状态","所属组织"};
+                "凭证号", "业务单号", "入池时间","影像号","账期","过账日期","报账单号","报账人","入账状态","所属组织"};
 
             String[] titleprop = {"xh", "invoiceType", "invoiceCode", "invoiceNo", "invoiceStatus", "invoiceDate",
                 "gfmc", "gfsh", "invoiceAmount", "taxAmount", "totalAmount", "listStatus", "remark", "incentiveFlag",
                 "collectStatus", "collectDate", "collectFrom", "qsfs", "systemName", "qszt", "qsrq", "qsr",
                 "inAccountMonth", "snVoucherNumber", "documentNumber", "createDate","imageNumber","accountPeriod"
-            ,"postingTime","bzdh","inAccountStatus","compCode"};
+            ,"postingTime","bzdh","bzr","inAccountStatus","compCode"};
             // 需要设置返回列表标题时调用
             json = super.setTitleList(titlelist, titleprop);
             PageHelper.startPage(curr, size);

dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml

@@ -7,6 +7,7 @@
                type="com.dxhy.extend.model.ExtBbfpzhcxRespVO">
         <result column="invoice_code" property="invoiceCode"/>
         <result column="bzdh" property="bzdh"/>
+        <result column="bzr" property="bzr"/>
         <result column="inaccount_status" property="inAccountStatus"/>
         <result column="invoice_no" property="invoiceNo"/>
         <result column="kprq" property="invoiceDate"/>
@@ -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 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and t.bzr like concat('%',#{bzr},'%')
+        </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
             and t.inaccount_status = #{inAccountStatus}
         </if>
@@ -335,6 +339,9 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and t.bzr like concat('%',#{bzr},'%')
+        </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
             and t.in_account_status = #{inAccountStatus}
         </if>

dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml

@@ -7,6 +7,7 @@
                type="com.dxhy.extend.model.ExtBbycfpcxRespVO">
         <result column="inaccount_status" property="inAccountStatus"/>
         <result column="bzdh" property="bzdh"/>
+        <result column="bzr" property="bzr"/>
         <result column="sn_voucher_number" property="snVoucherNumber"/>
         <result column="account_period" property="accountPeriod"/>
         <result column="posting_time" property="postingTime"/>
@@ -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 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and t.bzr like concat('%',#{bzr},'%')
+        </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
             and t.inaccount_status = #{inAccountStatus}
         </if>
@@ -183,6 +187,9 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and t.bzr like concat('%',#{bzr},'%')
+        </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
             and t.inaccount_status = #{inAccountStatus}
         </if>

dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml

@@ -127,6 +127,9 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
             and t.bzdh = #{bzdh}
         </if>
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and t.bzr like concat('%',#{bzr},'%')
+        </if>
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and t.sn_voucher_number = #{snVoucherNumber}
         </if>
@@ -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 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
             and t.bzdh = #{bzdh}
         </if>
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and t.bzr like concat('%',#{bzr},'%')
+        </if>
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and t.sn_voucher_number = #{snVoucherNumber}
         </if>
@@ -358,6 +365,9 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
             and bzdh = #{bzdh}
         </if>
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and bzr like concat('%',#{bzr},'%')
+        </if>
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and sn_voucher_number = #{snVoucherNumber}
         </if>
@@ -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 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
             and bzdh = #{bzdh}
         </if>
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and bzr like concat('%',#{bzr},'%')
+        </if>
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
             and (comp_code in
             <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
@@ -560,6 +574,9 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
             and t.bzdh = #{bzdh}
         </if>
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and t.bzr like concat('%',#{bzr},'%')
+        </if>
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
             and (t.comp_code in
             <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
@@ -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 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
             and t.bzdh = #{bzdh}
         </if>
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and t.bzr like concat('%',#{bzr},'%')
+        </if>
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
             and (t.comp_code in
             <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">

dxhy-extend/src/main/resources/mapper/TicketMapper.xml

@@ -72,6 +72,9 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
             and t.bzdh = #{bzdh}
         </if>
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and bzr like concat('%',#{bzr},'%')
+        </if>
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and t.sn_voucher_number = #{snVoucherNumber}
         </if>
@@ -153,6 +156,9 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
             and t.bzdh = #{bzdh}
         </if>
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and bzr like concat('%',#{bzr},'%')
+        </if>
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and t.sn_voucher_number = #{snVoucherNumber}
         </if>