From 756b1baa6348cae3f508b837a82626e9fead1220 Mon Sep 17 00:00:00 2001
From: lulz1 <lulz1@chint.com>
Date: Mon, 29 Apr 2024 10:13:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=BF=94=E5=9B=9E=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../out/OrderDetailController.java            |  2 +-
 .../domain/aggregates/order/RouteOrder.java   |  2 ++
 .../value_object/RouteOrderFiledVO.java       | 28 +++++++++++++++++++
 .../com/chint/domain/value_object/UserVO.java |  1 +
 src/main/resources/application-test.yml       | 22 +++++++--------
 5 files changed, 43 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/com/chint/domain/value_object/RouteOrderFiledVO.java

diff --git a/src/main/java/com/chint/application/out/OrderDetailController.java b/src/main/java/com/chint/application/out/OrderDetailController.java
index d2c9842b..0459183a 100644
--- a/src/main/java/com/chint/application/out/OrderDetailController.java
+++ b/src/main/java/com/chint/application/out/OrderDetailController.java
@@ -116,7 +116,7 @@ public class OrderDetailController {
 
     @ApiOperation("订单明细导出接口")
     @PostMapping("/export")
-    public ResponseEntity export(@RequestBody AuthenticationSignDto authenticationDto) {
+    public ResponseEntity<Resource> export(@RequestBody AuthenticationSignDto authenticationDto) {
         File file = orderDetailPageQuery.exportOrderDetailToFile(authenticationDto);
         Resource resource;
         try {
diff --git a/src/main/java/com/chint/domain/aggregates/order/RouteOrder.java b/src/main/java/com/chint/domain/aggregates/order/RouteOrder.java
index e35f579b..87e0fedc 100644
--- a/src/main/java/com/chint/domain/aggregates/order/RouteOrder.java
+++ b/src/main/java/com/chint/domain/aggregates/order/RouteOrder.java
@@ -575,4 +575,6 @@ public class RouteOrder implements Serializable {
         routeOrderDetail.setCarOrderDetailList(carOrderDetailList);
         return routeOrderDetail;
     }
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/chint/domain/value_object/RouteOrderFiledVO.java b/src/main/java/com/chint/domain/value_object/RouteOrderFiledVO.java
new file mode 100644
index 00000000..84347afd
--- /dev/null
+++ b/src/main/java/com/chint/domain/value_object/RouteOrderFiledVO.java
@@ -0,0 +1,28 @@
+package com.chint.domain.value_object;
+
+import com.chint.domain.aggregates.order.ApproveOrderNo;
+import com.chint.domain.aggregates.order.RouteCustomExtensionField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.data.relational.core.mapping.Embedded;
+
+import java.util.List;
+
+@Data
+public class RouteOrderFiledVO {
+    private Long routeId;
+    @ApiModelProperty("订单号")
+    private String routeOrderNo;
+    @ApiModelProperty("用户工号")
+    private String userId;
+    @ApiModelProperty("用户名称")
+    private String userName;
+    //差标等级
+    private String standardLevel;
+    private String createTime;
+    //审批订单号
+    @Embedded.Nullable
+    private ApproveOrderNo approveOrderNo;
+    @ApiModelProperty("自定义字段")
+    private List<RouteCustomExtensionField> routeCustomExtensionFieldList;
+}
diff --git a/src/main/java/com/chint/domain/value_object/UserVO.java b/src/main/java/com/chint/domain/value_object/UserVO.java
index 0e34d2ab..f8b07435 100644
--- a/src/main/java/com/chint/domain/value_object/UserVO.java
+++ b/src/main/java/com/chint/domain/value_object/UserVO.java
@@ -22,4 +22,5 @@ public class UserVO {
     private String standardLevel;
     private String companyCode;
     private String companyName;
+    private UserLoginParam userLoginParam;
 }
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index e6f879c1..71cb5140 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -5,20 +5,20 @@ server:
 
 chint:
   loginSecretKey: Superdandan
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    host: 47.97.21.20
-    port: 3306
-    database: itinerary_booking
-    username: route
-    password: 123456
 #  datasource:
 #    driver-class-name: com.mysql.cj.jdbc.Driver
-#    host: 10.10.24.44
-#    port: 6603
+#    host: 47.97.21.20
+#    port: 3306
 #    database: itinerary_booking
-#    username: tripbook
-#    password: W@Xgf25d&lRk*L0X#
+#    username: route
+#    password: 123456
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    host: 10.10.24.44
+    port: 6603
+    database: itinerary_booking
+    username: tripbook
+    password: W@Xgf25d&lRk*L0X#
   url: https://gxdev03.chint.com/businesstravelhome/
   redis:
     host: 10.10.103.131