From d92862d0dbdea3ce5b0fb03a2166bb97ff1fb37f Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Mon, 3 Apr 2023 09:00:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/bussalesorder/app/order/AppBusSalesOrderVo.java      | 5 +++++
 .../buscenter/biz/bussalesorder/BusSalesOrderMapper.xml      | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java
index 819c5b9d00..04b9bcbea1 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java
@@ -155,4 +155,9 @@ public class AppBusSalesOrderVo implements Vo {
     private String saler;
     @ApiModelProperty("是否显示打印按钮")
     private boolean printOrderBtn;
+
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("流程实例id")
+    private String procInstId;
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
index ecd7516cea..7efa6915e7 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
@@ -61,7 +61,9 @@
                0                                      as showFinancialBtn,
                bo.type,
                bo.contractNo                          as contractId,
-               bo.staffName as saler
+               bo.staffName as saler,
+              bo.procDefId,
+              bo.procInstId
         FROM bus_sales_order bo
                  left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
                  left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid