igo出行
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
Pu Zhibing
4 天以前 b1f2f102034b4433201225b67a9fc78c08e532f0 
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java


@@ -689,8 +689,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);


@@ -1116,8 +1115,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());