From c3e5e631dbb19f1fbdc4ceb99b775354c303a92a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 20:42:41 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/XianNingChuXing
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
index f500e74..107073f 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
@@ -145,6 +145,11 @@
List<Map<String, Object>> scopeList = tCompanyService.getCompanyScopeById(tCompanyId);
model.addAttribute("scopeList",scopeList);
+ //计费规则
+ TSystemPrice tSystemPrice = systemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("companyId", tCompanyId)
+ .eq("type", 2).last("LIMIT 1"));
+ model.addAttribute("contentExclusive",JSONObject.parseObject(tSystemPrice.getContent()));
+
return PREFIX + "tCompany_detail.html";
}
@@ -168,6 +173,10 @@
//经营区域
List<Map<String, Object>> scopeList = tCompanyService.getCompanyScopeById(tCompanyId);
model.addAttribute("scopeList",scopeList);
+ //计费规则
+ TSystemPrice tSystemPrice = systemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("companyId", tCompanyId)
+ .eq("type", 2).last("LIMIT 1"));
+ model.addAttribute("contentExclusive",JSONObject.parseObject(tSystemPrice.getContent()));
return PREFIX + "tCompany_edit.html";
}
@@ -192,6 +201,10 @@
//系统用户对象
User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 3).eq("objectId", tCompanyId));
model.addAttribute("user",user);
+ //计费规则
+ TSystemPrice tSystemPrice = systemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("companyId", tCompanyId)
+ .eq("type", 2).last("LIMIT 1"));
+ model.addAttribute("contentExclusive",JSONObject.parseObject(tSystemPrice.getContent()));
return PREFIX + "tCompany_detailFranchisee.html";
}
@@ -219,6 +232,11 @@
User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 3).eq("objectId", tCompanyId));
model.addAttribute("user",user);
+ //计费规则
+ TSystemPrice tSystemPrice = systemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("companyId", tCompanyId)
+ .eq("type", 2).last("LIMIT 1"));
+ model.addAttribute("contentExclusive",JSONObject.parseObject(tSystemPrice.getContent()));
+
return PREFIX + "tCompany_updateFranchisee.html";
}
--
Gitblit v1.7.1