Merge remote-tracking branch 'origin/shuttle_rcs_dev' into shuttle_rcs_dev

zjj

昨天 ffbcb17a9ce705b443c3a450e3e3d56f13ee712f

 src/main/java/com/zy/asrs/controller/BasShuttleController.java

@@ -80,8 +80,8 @@

    @RequestMapping(value = "/basShuttle/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
    public R delete(@RequestParam(value="ids[]") Integer[] ids){
         for (Integer id : ids){
            basShuttleService.deleteById(id);
        }
        return R.ok();
@@ -124,4 +124,19 @@
        return R.ok();
    }

    @RequestMapping(value = "/basShuttle/updateCharge")
    @ManagerAuth
    public R updateCharge(BasShuttle basShuttle){
        if (Cools.isEmpty(basShuttle) || null==basShuttle.getChargeLine()){
            return R.error();
        }

        List<BasShuttle> basShuttles = basShuttleService.selectList(new EntityWrapper<BasShuttle>());
        for (BasShuttle shuttle : basShuttles) {
            shuttle.setChargeLine(basShuttle.getChargeLine());
            basShuttleService.updateById(shuttle);
        }
        return R.ok();
    }

}