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 @@
+
+
@@ -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 @@
clock_in_location = #{clockInLocation},
remark = #{remark},
update_by = #{updateBy},
+ ledger_account_status = #{ledgerAccountStatus},
update_time = SYSDATE()
WHERE id = #{id}