Merge remote-tracking branch 'origin/master'

luodangjia

2024-05-24 503bc89c55d675a27b689419aa906a070ca5cb03

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java

@@ -126,6 +126,8 @@
        model.addAttribute("zcModelList",zcModelList);
        List<TServerCarmodel> kcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
        model.addAttribute("kcModelList",kcModelList);
        List<TServerCarmodel> jsjModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 7).eq("state", 1));
        model.addAttribute("jsjModelList",jsjModelList);
        return PREFIX + "tCar_add.html";
    }

@@ -184,8 +186,10 @@
        Integer four = 1;
        Integer five = 1;
        Integer six = 1;
        Integer seven = 1;
        Integer zcModel = 0;
        Integer kcModel = 0;
        Integer jsjModel = 0;
        for (TCarService obj : serviceList){
            if (obj.getType() == 1){
                one = 2;
@@ -207,6 +211,10 @@
            if (obj.getType() == 6){
                six = 2;
            }
            if (obj.getType() == 7){
                seven = 2;
                jsjModel = obj.getServerCarModelId();
            }
        }
        model.addAttribute("one",one);
        model.addAttribute("two",two);
@@ -214,13 +222,17 @@
        model.addAttribute("four",four);
        model.addAttribute("five",five);
        model.addAttribute("six",six);
        model.addAttribute("seven",seven);
        model.addAttribute("zcModel",zcModel);
        model.addAttribute("kcModel",kcModel);
        model.addAttribute("jsjModel",jsjModel);

        List<TServerCarmodel> zcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
        model.addAttribute("zcModelList",zcModelList);
        List<TServerCarmodel> kcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
        model.addAttribute("kcModelList",kcModelList);
        List<TServerCarmodel> jsjModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 7).eq("state", 1));
        model.addAttribute("jsjModelList",jsjModelList);

        //车辆品牌
        List<TCarBrand> brandList = tCarBrandService.selectList(new EntityWrapper<TCarBrand>().eq("state", 1));
@@ -393,7 +405,7 @@
     */
    @RequestMapping(value = "/add")
    @ResponseBody
    public Object add(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel) {
    public Object add(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel,String jsjModel) {
        if (1 == roleType){  //平台
            if (2 == companyType.intValue()){
                if (SinataUtil.isNotEmpty(oneId)){
@@ -445,6 +457,8 @@
                service.setServerCarModelId(Integer.valueOf(zcModel));
            }else if (3 == service.getType()){
                service.setServerCarModelId(Integer.valueOf(kcModel));
            }else if (7 == service.getType()){
                service.setServerCarModelId(Integer.valueOf(jsjModel));
            }
            tCarServiceService.insert(service);
        }
@@ -495,7 +509,7 @@
     */
    @RequestMapping(value = "/update")
    @ResponseBody
    public Object update(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel) {
    public Object update(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel,String jsjModel) {
        if (1 == roleType){  //平台
            if (2 == companyType.intValue()){
                if (SinataUtil.isNotEmpty(oneId)){
@@ -539,6 +553,8 @@
                service.setServerCarModelId(Integer.valueOf(zcModel));
            }else if (3 == service.getType()){
                service.setServerCarModelId(Integer.valueOf(kcModel));
            }else if (7 == service.getType()){
                service.setServerCarModelId(Integer.valueOf(jsjModel));
            }
            tCarServiceService.insert(service);
        }