修改bug和管理后台报表

Pu Zhibing

2025-06-06 b1f2f102034b4433201225b67a9fc78c08e532f0

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java

@@ -328,8 +328,7 @@
                    
                        orderPrivateCar.setDriverId(driver1.getId());
                        orderPrivateCar.setCarId(driver1.getCarId());
                        orderPrivateCar.setCompanyId(driver1.getFranchiseeId() != null && driver1.getFranchiseeId() != 0 ? driver1.getFranchiseeId() : (
                                driver1.getCompanyId() != null && driver1.getCompanyId() != 0 ? driver1.getCompanyId() : 1));
                        orderPrivateCar.setCompanyId(driver1.getCompanyId());
                        orderPrivateCar.setSnatchOrderTime(new Date());
                        orderPrivateCar.setState(orderPrivateCar.getOldState());
                        orderPrivateCar.setOldState(null);
@@ -677,8 +676,7 @@
                    
                        orderLogistics.setDriverId(driver1.getId());
                        orderLogistics.setCarId(driver1.getCarId());
                        orderLogistics.setCompanyId(driver1.getFranchiseeId() != null && driver1.getFranchiseeId() != 0 ? driver1.getFranchiseeId() : (
                                driver1.getCompanyId() != null && driver1.getCompanyId() != 0 ? driver1.getCompanyId() : 1));
                        orderLogistics.setCompanyId(driver1.getCompanyId());
                        orderLogistics.setState(orderLogistics.getOldState());
                        orderLogistics.setOldState(null);
                        orderLogistics.setSnatchOrderTime(new Date());
@@ -965,7 +963,7 @@
                Map<String, String> map = new HashMap<>();
                map.put("orderId", reassign.getOrderId().toString());
                map.put("orderType", reassign.getOrderType().toString());
                List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
                List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getCompanyId(), 1);
                for(Dispatch dispatch : dispatches){
                    jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
                }
@@ -1027,7 +1025,7 @@
                        Map<String, String> map = new HashMap<>();
                        map.put("orderId", reassign.getOrderId().toString());
                        map.put("orderType", reassign.getOrderType().toString());
                        List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
                        List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getCompanyId(), 1);
                        for(Dispatch dispatch : dispatches){
                            jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
                        }
@@ -1119,7 +1117,7 @@
                Map<String, String> map = new HashMap<>();
                map.put("orderId", reassign.getOrderId().toString());
                map.put("orderType", reassign.getOrderType().toString());
                List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
                List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getCompanyId(), 1);
                for(Dispatch dispatch : dispatches){
                    jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
                }