From 3bfcafa2bac869257d8324ead9d08a2dde3a9e28 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Wed, 23 Nov 2022 01:17:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E7=A1=AE=E8=AE=A4=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ghy/web/controller/order/OrderDetailController.java    | 2 ++
 .../main/java/com/ghy/web/pojo/vo/OrderListResponse.java   | 4 ++++
 .../src/main/java/com/ghy/order/domain/OrderDetail.java    | 2 ++
 .../src/main/resources/mapper/order/OrderDetailMapper.xml  | 7 +++++++
 4 files changed, 15 insertions(+)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
index ad660287..d1ac215e 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
@@ -379,6 +379,8 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setChangeMoney(changeMoney);
 //            orderListResponse.setAfterServiceRecordList(afterServiceRecordList);
             orderListResponse.setUpdateTime(detail.getUpdateTime());
+            orderListResponse.setShelveStatus(detail.getShelveStatus());
+            orderListResponse.setLedgerAccountStatus(detail.getLedgerAccountStatus());
             orderListResponses.add(orderListResponse);
         });
         return voDataTable(orderListResponses, list);
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
index 8752a826..32aa8644 100644
--- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
@@ -102,4 +102,8 @@ public class OrderListResponse {
     private Boolean isOnlyServ;
 
     private Date updateTime;
+
+    private Integer shelveStatus;
+
+    private Integer ledgerAccountStatus;
 }
diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
index 9b40625e..08b2841e 100644
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
@@ -75,4 +75,6 @@ public class OrderDetail extends BaseEntity {
     private Boolean useTimeNotRange;
 
     private Integer shelveStatus;
+
+    private Integer ledgerAccountStatus;
 }
diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
index 89fccd06..1bbfc64f 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
@@ -19,6 +19,8 @@
         <result property="workBeginTime"     column="work_begin_time"/>
         <result property="workFinishTime"    column="work_finish_time"/>
         <result property="clockInLocation"    column="clock_in_location"/>
+        <result property="shelveStatus"    column="shelve_status"/>
+        <result property="ledgerAccountStatus"    column="ledger_account_status"/>
         <result property="createBy"          column="create_by"/>
         <result property="createTime"        column="create_time"/>
         <result property="updateBy"          column="update_by"/>
@@ -41,6 +43,8 @@
                work_begin_time,
                work_finish_time,
                clock_in_location,
+               ledger_account_status,
+               shelve_status,
                create_by,
                create_time,
                update_time,
@@ -63,6 +67,8 @@
                od.work_begin_time,
                od.work_finish_time,
                od.clock_in_location,
+               od.ledger_account_status,
+               od.shelve_status,
                od.create_by,
                od.create_time,
                od.update_time,
@@ -220,6 +226,7 @@
             <if test="clockInLocation != null and clockInLocation != ''">clock_in_location = #{clockInLocation},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="ledgerAccountStatus != null">ledger_account_status = #{ledgerAccountStatus},</if>
             update_time = SYSDATE()
         </set>
         WHERE id = #{id}