diff --git a/order-management-common/src/main/java/com/dxhy/order/model/OrderInvoiceDetail.java b/order-management-common/src/main/java/com/dxhy/order/model/OrderInvoiceDetail.java
index e586e330..6bba07c4 100644
--- a/order-management-common/src/main/java/com/dxhy/order/model/OrderInvoiceDetail.java
+++ b/order-management-common/src/main/java/com/dxhy/order/model/OrderInvoiceDetail.java
@@ -79,4 +79,49 @@ public class OrderInvoiceDetail implements Serializable {
private String invalidPushSbyy;
private String sksbdm;
private String entId;
+
+ /**
+ * 报账单号
+ */
+ private String bzdh;
+ /**
+ * 系统来源
+ */
+ private String xtly;
+ /**
+ * 公司代码
+ */
+ private String gsdm;
+ /**
+ * 驳回状态
+ */
+ private String bhzt;
+ /**
+ * 员工姓名
+ */
+ private String ygxm;
+ /**
+ * 开票凭账号
+ */
+ private String kppzh;
+ /**
+ * 凭证过账日期
+ */
+ private Date pzgzrq;
+ /**
+ * 是否预制发票
+ */
+ private String yzfp;
+ /**
+ * 原始结算单号
+ */
+ private String originDdh;
+ /**
+ * 原始订单ID
+ */
+ private String originOrderId;
+ /**
+ * 矿别
+ */
+ private String kb;
}
diff --git a/order-management-common/src/main/java/com/dxhy/order/model/page/OrderListQuery.java b/order-management-common/src/main/java/com/dxhy/order/model/page/OrderListQuery.java
index 698d3176..c8dda079 100644
--- a/order-management-common/src/main/java/com/dxhy/order/model/page/OrderListQuery.java
+++ b/order-management-common/src/main/java/com/dxhy/order/model/page/OrderListQuery.java
@@ -4,6 +4,8 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
+import java.util.Date;
+
/**
* @author :杨士勇
* @ClassName :OrderListQuery
@@ -236,4 +238,50 @@ public class OrderListQuery {
* 0 初始化 1 推送成功 2推送失败
*/
private String tsJos;
+
+ /**
+ * 报账单号
+ */
+ private String bzdh;
+ /**
+ * 系统来源
+ */
+ private String xtly;
+ /**
+ * 公司代码
+ */
+ private String gsdm;
+ /**
+ * 驳回状态
+ */
+ private String bhzt;
+ /**
+ * 员工姓名
+ */
+ private String ygxm;
+ /**
+ * 开票凭账号
+ */
+ private String kppzh;
+ /**
+ * 凭证过账日期
+ */
+ private Date pzgzrq;
+ /**
+ * 是否预制发票
+ */
+ private String yzfp;
+ /**
+ * 原始结算单号
+ */
+ private String originDdh;
+ /**
+ * 原始订单ID
+ */
+ private String originOrderId;
+ /**
+ * 矿别
+ */
+ private String kb;
+
}
diff --git a/order-management-common/src/main/java/com/dxhy/order/utils/PageBeanConvertUtil.java b/order-management-common/src/main/java/com/dxhy/order/utils/PageBeanConvertUtil.java
index 4f3a7743..08f55cd5 100644
--- a/order-management-common/src/main/java/com/dxhy/order/utils/PageBeanConvertUtil.java
+++ b/order-management-common/src/main/java/com/dxhy/order/utils/PageBeanConvertUtil.java
@@ -186,6 +186,19 @@ public class PageBeanConvertUtil {
resultMap.put("sbyy", orderListQuery.getSbyy());
resultMap.put("queryTime", orderListQuery.getQueryTime());
resultMap.put("checkStatus", orderListQuery.getCheckStatus());
+
+ resultMap.put("bzdh", orderListQuery.getBzdh());
+ resultMap.put("xtly", orderListQuery.getXtly());
+ resultMap.put("gsdm", orderListQuery.getGsdm());
+ resultMap.put("bhzt", orderListQuery.getBhzt());
+ resultMap.put("ygxm", orderListQuery.getYgxm());
+ resultMap.put("kppzh", orderListQuery.getKppzh());
+ resultMap.put("pzgzrq", orderListQuery.getPzgzrq());
+ resultMap.put("yzfp", orderListQuery.getYzfp());
+ resultMap.put("originDdh", orderListQuery.getOriginDdh());
+ resultMap.put("originOrderId", orderListQuery.getOriginOrderId());
+ resultMap.put("kb", orderListQuery.getKb());
+
return resultMap;
}
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/model/bo/OriginOrderBO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/model/bo/OriginOrderBO.java
index 257efe21..ac897924 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/model/bo/OriginOrderBO.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/model/bo/OriginOrderBO.java
@@ -24,5 +24,6 @@ public class OriginOrderBO {
private Integer num;
private Integer isdel;
private String originOrderId;
+ private String bzdh;
}
diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderOriginExtendInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderOriginExtendInfoMapper.xml
index 957d0657..6c0ea990 100644
--- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderOriginExtendInfoMapper.xml
+++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderOriginExtendInfoMapper.xml
@@ -25,6 +25,7 @@
+
@@ -177,7 +178,8 @@
op.xhf_mc,
op.ghf_mc,
op.id,
- op.num
+ op.num,
+ op.bzdh
FROM order_orgin_extend_info ooe
LEFT JOIN
order_process_info op ON ooe.origin_order_id = op.order_info_id
@@ -287,6 +289,9 @@
and op.order_status = #{map.orderStatus,jdbcType=VARCHAR}
+
+ and op.bzdh = #{map.bzdh,jdbcType=VARCHAR}
+
and op.xhf_nsrsbh = ''
@@ -357,6 +362,10 @@
+
+ and op.bzdh = #{map.bzdh,jdbcType=VARCHAR}
+
+
and op.xhf_nsrsbh = ''
diff --git a/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml b/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml
index 0f52d9ad..c78f72fe 100644
--- a/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml
+++ b/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml
@@ -130,6 +130,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -1243,7 +1254,18 @@
oii.email_push_status,
oii.sksbdm,
oii.skcwdm,
- oii.skcwms
+ oii.skcwms,
+ opi.bzdh,
+ opi.xtly,
+ opi.gsdm,
+ opi.bhzt,
+ opi.ygxm,
+ opi.kppzh,
+ opi.pzgzrq,
+ opi.yzfp,
+ opi.origin_ddh,
+ opi.origin_order_id,
+ opi.kb
FROM order_invoice_info oii
LEFT JOIN order_info oi ON oii.order_info_id = oi.id
@@ -1517,6 +1539,39 @@
and oii.kphjje <= CAST(#{map.maxhjje,jdbcType=VARCHAR} as DECIMAL)
+
+ and opi.bzdh = #{map.bzdh,jdbcType=VARCHAR}
+
+
+ and opi.xtly = #{map.xtly,jdbcType=VARCHAR}
+
+
+ and opi.gsdm = #{map.gsdm,jdbcType=VARCHAR}
+
+
+ and opi.bhzt = #{map.bhzt,jdbcType=VARCHAR}
+
+
+ and opi.ygxm = #{map.ygxm,jdbcType=VARCHAR}
+
+
+ and opi.kppzh = #{map.kppzh,jdbcType=VARCHAR}
+
+
+ and opi.pzgzrq = #{map.pzgzrq,jdbcType=VARCHAR}
+
+
+ and opi.yzfp = #{map.yzfp,jdbcType=VARCHAR}
+
+
+ and opi.origin_ddh = #{map.originDdh,jdbcType=VARCHAR}
+
+
+ and opi.origin_order_id = #{map.originOrderId,jdbcType=VARCHAR}
+
+
+ and opi.kb = #{map.kb,jdbcType=VARCHAR}
+