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

app单量统计接口修改

This commit is contained in:
donqi 2023-08-22 23:01:00 +08:00
parent 555fd91a56
commit 7733e4f755
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -738,8 +738,10 @@ public class OrderController extends BaseController {
// 统计监控单量 // 统计监控单量
orderMaster.setOrderStatus(null); orderMaster.setOrderStatus(null);
orderMaster.setIsMonitoredOrder(true); orderMaster.setIsMonitoredOrder(true);
orderMaster.setAllSelfAssigned(0);
response.setMonitoredOrderNum(orderMasterService.countOrderMasterList(orderMaster)); response.setMonitoredOrderNum(orderMasterService.countOrderMasterList(orderMaster));
orderMaster.setIsMonitoredOrder(false); orderMaster.setIsMonitoredOrder(false);
orderMaster.setAllSelfAssigned(null);
// 统计搁置单量 // 统计搁置单量
OrderDetail orderDetail1 = new OrderDetail(); OrderDetail orderDetail1 = new OrderDetail();
orderDetail1.setDeptId(request.getDeptId()); orderDetail1.setDeptId(request.getDeptId());
@ -761,7 +763,6 @@ public class OrderController extends BaseController {
orderListRequest.setTimeout(1); orderListRequest.setTimeout(1);
orderListRequest.setWorkerId(request.getWorkerId()); orderListRequest.setWorkerId(request.getWorkerId());
orderListRequest.setIsMonitoredOrder(true); orderListRequest.setIsMonitoredOrder(true);
orderListRequest.setAllSelfAssigned(0);
AjaxResult overTimeRes = this.appMixOrderList(orderListRequest); AjaxResult overTimeRes = this.appMixOrderList(orderListRequest);
List<OrderListResponse> overTimeList = (List) overTimeRes.get("data"); List<OrderListResponse> overTimeList = (List) overTimeRes.get("data");
response.setOverTimeOrderNum(overTimeList.size()); response.setOverTimeOrderNum(overTimeList.size());

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

@ -214,6 +214,9 @@
<if test="isMonitoredOrder"> <if test="isMonitoredOrder">
AND (om.all_self_assigned = 0 or om.all_self_assigned is null) 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">
AND all_self_assigned = #{allSelfAssigned}
</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}
</if> </if>