From 3b56d93c50c2cde9738c8081a08cb657cbe6f087 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 24 七月 2024 13:49:28 +0800
Subject: [PATCH] 7.234

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java |   38 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
index c260e41..b374820 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
@@ -107,7 +107,7 @@
         //查询所有专车车型
         Integer objectId = ShiroKit.getUser().getObjectId();
         List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 4).eq("companyId", objectId).ne("state", 3));
-        List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("isPackage", 1).eq("state", 1));
+        List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4));
         List<TServerCarmodel> serverCarmodels = new ArrayList<>();
         for(TServerCarmodel tsc : modelList){
             boolean b = true;
@@ -160,6 +160,40 @@
         return PREFIX + "tSystemPrice_edit.html";
     }
 
+
+
+    @RequestMapping("/tSmallPrice_update/{tSystemPriceId}")
+    public String tSmallPrice_update(@PathVariable Integer tSystemPriceId, Model model) {
+        TSystemPrice tSystemPrice = tSystemPriceService.selectById(tSystemPriceId);
+        model.addAttribute("item",tSystemPrice);
+        LogObjectHolder.me().set(tSystemPrice);
+
+        JSONObject json = JSONObject.fromObject(tSystemPrice.getContent());
+        model.addAttribute("json",json);
+
+        //查询所有专车车型
+//        List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 4).ne("state", 3));
+//        List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
+        List<TServerCarmodel> serverCarmodels = new ArrayList<>();
+//        for(TServerCarmodel tsc : modelList){
+//            boolean b = true;
+//            for(TSystemPrice tsp : tSystemPrices){
+//                if(tsc.getId() == tsp.getServerCarModelId() && tsc.getId() != tSystemPriceId){
+//                    b = false;
+//                    break;
+//                }
+//            }
+//            if(b){
+//                serverCarmodels.add(tsc);
+//            }
+//        }
+        TServerCarmodel tSystemPrice1 = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
+        serverCarmodels.add(tSystemPrice1);
+        model.addAttribute("modelList", serverCarmodels);
+
+        return PREFIX + "tSystemPrice_edit.html";
+    }
+
     /**
      * 获取专车价格设置列表
      */
@@ -175,7 +209,7 @@
     @ResponseBody
     public Object listSmall(String name,Integer state) {
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        page.setRecords(tSystemPriceService.getSpecialPriceList(page,ShiroKit.getUser().getObjectId(),name,state));
+        page.setRecords(tSystemPriceService.getSpecialPriceList1(page,ShiroKit.getUser().getObjectId(),name,state));
         return super.packForBT(page);
     }
 

--
Gitblit v1.7.1