登录返回的数据,添加登录参数
This commit is contained in:
parent
cf0b5f6100
commit
756b1baa63
|
@ -116,7 +116,7 @@ public class OrderDetailController {
|
||||||
|
|
||||||
@ApiOperation("订单明细导出接口")
|
@ApiOperation("订单明细导出接口")
|
||||||
@PostMapping("/export")
|
@PostMapping("/export")
|
||||||
public ResponseEntity export(@RequestBody AuthenticationSignDto authenticationDto) {
|
public ResponseEntity<Resource> export(@RequestBody AuthenticationSignDto authenticationDto) {
|
||||||
File file = orderDetailPageQuery.exportOrderDetailToFile(authenticationDto);
|
File file = orderDetailPageQuery.exportOrderDetailToFile(authenticationDto);
|
||||||
Resource resource;
|
Resource resource;
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -575,4 +575,6 @@ public class RouteOrder implements Serializable {
|
||||||
routeOrderDetail.setCarOrderDetailList(carOrderDetailList);
|
routeOrderDetail.setCarOrderDetailList(carOrderDetailList);
|
||||||
return routeOrderDetail;
|
return routeOrderDetail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
|
@ -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;
|
||||||
|
}
|
|
@ -22,4 +22,5 @@ public class UserVO {
|
||||||
private String standardLevel;
|
private String standardLevel;
|
||||||
private String companyCode;
|
private String companyCode;
|
||||||
private String companyName;
|
private String companyName;
|
||||||
|
private UserLoginParam userLoginParam;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,20 +5,20 @@ server:
|
||||||
|
|
||||||
chint:
|
chint:
|
||||||
loginSecretKey: Superdandan
|
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:
|
# datasource:
|
||||||
# driver-class-name: com.mysql.cj.jdbc.Driver
|
# driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
# host: 10.10.24.44
|
# host: 47.97.21.20
|
||||||
# port: 6603
|
# port: 3306
|
||||||
# database: itinerary_booking
|
# database: itinerary_booking
|
||||||
# username: tripbook
|
# username: route
|
||||||
# password: W@Xgf25d&lRk*L0X#
|
# 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/
|
url: https://gxdev03.chint.com/businesstravelhome/
|
||||||
redis:
|
redis:
|
||||||
host: 10.10.103.131
|
host: 10.10.103.131
|
||||||
|
|
Loading…
Reference in New Issue