From d1f64b7d4b316f58594999257bb9146f68a51355 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 18:25:04 +0800
Subject: [PATCH] modify
---
gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java | 3 +++
gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml | 10 ++++++++--
gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java | 3 ++-
gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderListDto.java | 6 +++++-
4 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java b/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java
index f24d406..18cb88e 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java
@@ -41,7 +41,8 @@
@ApiResponse(code = 200, message = "success", response = JhyOrderListVo.class)
)
@PostMapping(value = "/jhy/order/list")
- public JsonResult<PageInfo<JhyOrderListVo>> orderList(@RequestBody JhyOrderListDto jhyOrderListDto) {
+ public JsonResult<PageInfo<JhyOrderListVo>> orderList(@RequestBody JhyOrderListDto jhyOrderListDto, HttpServletRequest request) {
+ jhyOrderListDto.setUserId(getUserId(request));
PageInfo<JhyOrderListVo> result = jhyOrderService.orderList(jhyOrderListDto);
return JsonResult.success(result);
}
diff --git a/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderListDto.java b/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderListDto.java
index 913648e..e0cafe7 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderListDto.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderListDto.java
@@ -15,8 +15,12 @@
@ApiModelProperty(value="每页显示记录数")
private int pageSize=10;
- @ApiModelProperty(value = "状态 1-新任务 2-服务中 3-待入库 4-已完成")
+ @ApiModelProperty(value = "状态 用户:1-待接单 2-服务中 3-已完成 5-已取消 集物员：1-新任务 2-服务中 3-待入库 4-已完成")
private Integer status;
+ @ApiModelProperty(value = "1-用户 2-集物员")
+ private Integer type;
+ @ApiModelProperty(hidden = true)
+ private String userId;
}
diff --git a/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java b/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
index c3dde64..6b0b83f 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
@@ -55,4 +55,7 @@
@ApiModelProperty(value = "损耗重量")
private int lossWeight;
+
+ @ApiModelProperty(value = "状态")
+ private Integer status;
}
\ No newline at end of file
diff --git a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
index 8481b15..abb1a85 100644
--- a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
+++ b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
@@ -10,14 +10,20 @@
,a.longitude
,a.latitude
,a.weight
+ ,a.status
,a.remark
,CONCAT(a.reserve_date, ' ', a.reserve_time) reserveTime
,GROUP_CONCAT(b.title) items
from xzx_jhy_order a
inner join xzx_jhy_order_items b on a.id=b.order_id
<where>
- <if test="record.status != 1">
- and jhy_id=#{record.userId}
+ <if test="record.type == 1">
+ and user_id=#{record.userId}
+ </if>
+ <if test="record.type == 2">
+ <if test="record.status != 1">
+ and jhy_id=#{record.userId}
+ </if>
</if>
<if test="record.status != null and record.status != ''">
and a.status = #{record.status}
--
Gitblit v1.9.1