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

zhibing.pu

2024-05-27 f9b9131367d9ba6fe852130b12083c0f5ea68bbb

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

@@ -170,7 +170,7 @@
     */
    @RequestMapping(value = "/add")
    @ResponseBody
    public Object add(TServerCarmodel tServerCarmodel) {
    public Object add(TServerCarmodel tServerCarmodel,@RequestParam Integer isPrivateCar,@RequestParam Integer isPackage ) {
        int count = tServerCarmodelService.selectCount(new EntityWrapper<TServerCarmodel>().eq("type", 1)
                .eq("name", tServerCarmodel.getName()).last(" and not FIND_IN_SET(state,'3')"));
        if (count > 0){
@@ -179,6 +179,8 @@
        tServerCarmodel.setInsertTime(new Date());
        tServerCarmodel.setState(1);
        tServerCarmodel.setType(1);
        tServerCarmodel.setIsPackage(isPackage);
        tServerCarmodel.setIsPrivateCar(isPrivateCar);
        tServerCarmodelService.insert(tServerCarmodel);
        return SUCCESS_TIP;
    }
@@ -188,10 +190,12 @@
     */
    @RequestMapping(value = "/update")
    @ResponseBody
    public Object update(TServerCarmodel tServerCarmodel) {
    public Object update(TServerCarmodel tServerCarmodel,@RequestParam Integer isPrivateCar,@RequestParam Integer isPackage) {
        tServerCarmodel.setInsertTime(new Date());
        tServerCarmodel.setState(1);
        tServerCarmodel.setType(1);
        tServerCarmodel.setIsPackage(isPackage);
        tServerCarmodel.setIsPrivateCar(isPrivateCar);
        tServerCarmodelService.updateById(tServerCarmodel);
        return SUCCESS_TIP;
    }