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

订单列表及订单量统计问题修复

This commit is contained in:
donqi 2022-12-03 22:21:33 +08:00
parent edd4b11bec
commit c2da55522f
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -490,16 +490,12 @@ public class OrderController extends BaseController {
response.setMonitoredOrderNum(orderMasterService.countOrderMasterList(orderMaster)); response.setMonitoredOrderNum(orderMasterService.countOrderMasterList(orderMaster));
orderMaster.setIsMonitoredOrder(false); orderMaster.setIsMonitoredOrder(false);
// 统计搁置单量 // 统计搁置单量
OrderListRequest orderListRequest = new OrderListRequest(); OrderDetail orderDetail1 = new OrderDetail();
orderListRequest.setWorkerId(request.getWorkerId()); orderDetail1.setWorkerId(request.getWorkerId());
orderListRequest.setIsMonitoredOrder(true); orderDetail1.setShelveStatus(1);
orderListRequest.setAllSelfAssigned(0); response.setShelvedOrderNum(orderDetailService.countOrderDetailList(orderDetail1));
orderListRequest.setShelveStatus(1);
AjaxResult shelveRes = this.appMixOrderList(orderListRequest);
List<OrderListResponse> shelveList = (List)shelveRes.get("data");
response.setShelvedOrderNum(shelveList.size());
// 统计售后中单量 // 统计售后中单量
orderListRequest = new OrderListRequest(); OrderListRequest orderListRequest = new OrderListRequest();
orderListRequest.setWorkerId(request.getWorkerId()); orderListRequest.setWorkerId(request.getWorkerId());
orderListRequest.setIsMonitoredOrder(true); orderListRequest.setIsMonitoredOrder(true);
orderListRequest.setAllSelfAssigned(0); orderListRequest.setAllSelfAssigned(0);

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

@ -164,7 +164,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,5) AND all_self_assigned = 0 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}