clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
kuang.yife 2023-05-17 20:38:16 +08:00
parent 4a094c256e 92bf1bb533
commit 444c532f9a
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -665,9 +665,11 @@ public class OrderController extends BaseController {
try { try {
OrderMaster orderMaster = new OrderMaster(); OrderMaster orderMaster = new OrderMaster();
orderMaster.setDeptId(request.getDeptId());
orderMaster.setOrderStatus(OrderStatus.RECEIVE.code()); orderMaster.setOrderStatus(OrderStatus.RECEIVE.code());
orderMaster.setWorkerId(request.getWorkerId()); orderMaster.setWorkerId(request.getWorkerId());
OrderDetail orderDetail = new OrderDetail(); OrderDetail orderDetail = new OrderDetail();
orderDetail.setDeptId(request.getDeptId());
orderDetail.setOrderStatus(OrderStatus.RECEIVE.code()); orderDetail.setOrderStatus(OrderStatus.RECEIVE.code());
orderDetail.setWorkerId(request.getWorkerId()); orderDetail.setWorkerId(request.getWorkerId());
orderDetail.setShelveStatus(0); orderDetail.setShelveStatus(0);
@ -721,11 +723,13 @@ public class OrderController extends BaseController {
orderMaster.setIsMonitoredOrder(false); orderMaster.setIsMonitoredOrder(false);
// 统计搁置单量 // 统计搁置单量
OrderDetail orderDetail1 = new OrderDetail(); OrderDetail orderDetail1 = new OrderDetail();
orderDetail1.setDeptId(request.getDeptId());
orderDetail1.setWorkerId(request.getWorkerId()); orderDetail1.setWorkerId(request.getWorkerId());
orderDetail1.setShelveStatus(1); orderDetail1.setShelveStatus(1);
response.setShelvedOrderNum(orderDetailService.countOrderDetailList(orderDetail1)); response.setShelvedOrderNum(orderDetailService.countOrderDetailList(orderDetail1));
// 统计售后中单量 // 统计售后中单量
OrderListRequest orderListRequest = new OrderListRequest(); OrderListRequest orderListRequest = new OrderListRequest();
orderListRequest.setDeptId(request.getDeptId());
orderListRequest.setWorkerId(request.getWorkerId()); orderListRequest.setWorkerId(request.getWorkerId());
orderListRequest.setIsMonitoredOrder(true); orderListRequest.setIsMonitoredOrder(true);
orderListRequest.setAllSelfAssigned(0); orderListRequest.setAllSelfAssigned(0);
@ -734,6 +738,7 @@ public class OrderController extends BaseController {
response.setAfterListNum(afterList.size()); response.setAfterListNum(afterList.size());
// 统计超时单量 // 统计超时单量
orderListRequest = new OrderListRequest(); orderListRequest = new OrderListRequest();
orderListRequest.setDeptId(request.getDeptId());
orderListRequest.setTimeout(1); orderListRequest.setTimeout(1);
orderListRequest.setWorkerId(request.getWorkerId()); orderListRequest.setWorkerId(request.getWorkerId());
orderListRequest.setIsMonitoredOrder(true); orderListRequest.setIsMonitoredOrder(true);

2
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStatisticsRequest.java
View File

@ -11,4 +11,6 @@ import lombok.Data;
@Data @Data
public class OrderStatisticsRequest { public class OrderStatisticsRequest {
private Long workerId; private Long workerId;
private Long deptId;
} }

4
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -88,7 +88,7 @@
<include refid="selectOrderMasterMoreInfo"></include> <include refid="selectOrderMasterMoreInfo"></include>
<where> <where>
<if test="isMonitoredOrder"> <if test="isMonitoredOrder">
AND all_self_assigned = 0 AND om.order_status in (1,2,3,4) AND (om.all_self_assigned = 0 or om.all_self_assigned is null) AND om.order_status in (1,2,3,4)
</if> </if>
<if test="allSelfAssigned != null"> <if test="allSelfAssigned != null">
AND all_self_assigned = #{allSelfAssigned} AND all_self_assigned = #{allSelfAssigned}
@ -183,7 +183,7 @@
SELECT COUNT(*) FROM order_master om SELECT COUNT(*) FROM order_master om
<where> <where>
<if test="isMonitoredOrder"> <if test="isMonitoredOrder">
AND all_self_assigned = 0 AND om.order_status in (1,2,3,4) AND (om.all_self_assigned = 0 or om.all_self_assigned is not null) AND om.order_status in (1,2,3,4)
</if> </if>
<if test="deptId != null and deptId != 0"> <if test="deptId != null and deptId != 0">
AND om.dept_id = #{deptId} AND om.dept_id = #{deptId}