From 08adf7ea8fa66b488e52335dbb3efb23bff67792 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 九月 2024 17:31:18 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/TOrderInvoiceQuery.java | 2 ++
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderInvoiceMapper.xml | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/TOrderInvoiceQuery.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/TOrderInvoiceQuery.java
index a06da9c..d12f20b 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/TOrderInvoiceQuery.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/TOrderInvoiceQuery.java
@@ -25,6 +25,8 @@
@ApiModelProperty(value = "开票方式（1=人工，2=自动）")
private Integer invoicingMethod;
+ @ApiModelProperty(value = "状态（1=待开票，2=开票中，3=已开票）")
+ private Integer status;
@ApiModelProperty(value = "申请人电话")
private String userPhone;
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderInvoiceMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderInvoiceMapper.xml
index c7fdb2d..d77920d 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderInvoiceMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderInvoiceMapper.xml
@@ -49,6 +49,9 @@
<if test="query.invoicingObjectType != null">
AND toi.invoicing_object_type = #{query.invoicingObjectType}
</if>
+ <if test="query.status != null">
+ AND toi.status = #{query.status}
+ </if>
<if test="query.invoiceMaterial != null">
AND toi.invoice_material = #{query.invoiceMaterial}
</if>
--
Gitblit v1.7.1