Merge remote-tracking branch 'origin/master'

luodangjia

2024-05-24 503bc89c55d675a27b689419aa906a070ca5cb03

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java

@@ -60,6 +60,14 @@
    }

    /**
     * 跳转到接送机车型设置首页
     */
    @RequestMapping("/transfer")
    public String transfer() {
        return PREFIX + "transfer.html";
    }

    /**
     * 跳转到添加专车车型设置
     */
    @RequestMapping("/tServerCarmodel_add")
@@ -119,6 +127,24 @@
        return PREFIX + "charter_edit.html";
    }

    /**
     * 跳转到添加接送机车型设置
     */
    @RequestMapping("/tServerCarmodel_addTransfer")
    public String tServerCarmodel_addTransfer() {
        return PREFIX + "transfer_add.html";
    }


    /**
     * 跳转到添加接送机车型设置
     */
    @RequestMapping("/tServerCarmodel_editTransfer")
    public String tServerCarmodel_editTransfer(Integer id, Model model) {
        TServerCarmodel tServerCarmodel = tServerCarmodelService.selectById(id);
        model.addAttribute("data", tServerCarmodel);
        return PREFIX + "transfer_edit.html";
    }

    /**
     * 获取专车车型设置列表
@@ -161,6 +187,21 @@
            page.setRecords(null);
        }else{
            page.setRecords(tServerCarmodelService.getServerCarModelList(page,3,name,state));
        }
        return super.packForBT(page);
    }

    /**
     * 获取接送机车型设置列表
     */
    @RequestMapping(value = "/listTransfer")
    @ResponseBody
    public Object listTransfer(String name,Integer state) {
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        if (ShiroKit.getUser().getRoleType() != 1){
            page.setRecords(null);
        }else{
            page.setRecords(tServerCarmodelService.getServerCarModelList(page,7,name,state));
        }
        return super.packForBT(page);
    }
@@ -263,7 +304,36 @@
        return SUCCESS_TIP;
    }

    /**
     * 新增接送机车型设置
     */
    @RequestMapping(value = "/addTransfer")
    @ResponseBody
    public Object addTransfer(TServerCarmodel tServerCarmodel) {
        int count = tServerCarmodelService.selectCount(new EntityWrapper<TServerCarmodel>().eq("type", 7)
                .eq("name", tServerCarmodel.getName()).last(" and not FIND_IN_SET(state,'3')"));
        if (count > 0){
            return new ErrorTip(500, "【"+tServerCarmodel.getName()+"】已存在,请重新输入");
        }
        tServerCarmodel.setInsertTime(new Date());
        tServerCarmodel.setState(1);
        tServerCarmodel.setType(7);
        tServerCarmodelService.insert(tServerCarmodel);
        return SUCCESS_TIP;
    }

    /**
     * 修改接送机车型设置
     */
    @RequestMapping(value = "/updateTransfer")
    @ResponseBody
    public Object updateTransfer(TServerCarmodel tServerCarmodel) {
        tServerCarmodel.setInsertTime(new Date());
        tServerCarmodel.setState(1);
        tServerCarmodel.setType(7);
        tServerCarmodelService.updateById(tServerCarmodel);
        return SUCCESS_TIP;
    }

    /**
     * 禁用/启用