From 25a638e0d5f282d26ff9da47e5b7aa5c9c1603d4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 23 十月 2024 18:34:20 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java
index e1e332e..54b8855 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java
@@ -82,8 +82,10 @@
*/
@RequestMapping("/user")
public String userIndex(Model model) {
- TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 3));
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",1).eq("type", 3).eq("language",1));
model.addAttribute("one",one);
+ TAgreement two = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",2).eq("type", 3).eq("language",1));
+ model.addAttribute("two",two);
return PREFIX + "tAgreementUser.html";
}
@@ -155,8 +157,10 @@
*/
@RequestMapping("/showCommonProblem")
public String showCommonProblem(Model model) {
- TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 12));
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",1).eq("type", 12).eq("language",1));
model.addAttribute("one",one);
+ TAgreement two = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",2).eq("type", 12).eq("language",1));
+ model.addAttribute("two",two);
return PREFIX + "commonProblem.html";
}
@@ -199,18 +203,42 @@
return PREFIX + "tAgreementSmallPieceLogistics.html";
}
+ /**
+ * 跳转到新司机培训设置
+ * @param model
+ * @return
+ */
+ @RequestMapping("/showNewDriverTraining")
+ public String showNewDriverTraining(Model model){
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 16));
+ model.addAttribute("one",one);
+ return PREFIX + "newDriverTraining.html";
+ }
+
/**
* 修改协议
*/
@RequestMapping(value = "/updateAppParam")
@ResponseBody
- public Object updateAppParam(@RequestParam Integer id,@RequestParam String context) {
+ public Object updateAppParam(@RequestParam Integer id,@RequestParam String context, Integer id1, String context1) {
TAgreement agreement = tAgreementService.selectById(id);
- agreement.setContent(context);
- agreement.setUpdateTime(new Date());
- agreement.setUpdateUser(ShiroKit.getUser().getId());
- tAgreementService.updateById(agreement);
+ if (agreement!=null){
+ agreement.setContent(context);
+ agreement.setUpdateTime(new Date());
+ agreement.setUpdateUser(ShiroKit.getUser().getId());
+ tAgreementService.updateById(agreement);
+ }
+
+
+ TAgreement agreement1 = tAgreementService.selectById(id1);
+ if (agreement1!=null){
+ agreement1.setContent(context1);
+ agreement1.setUpdateTime(new Date());
+ agreement1.setUpdateUser(ShiroKit.getUser().getId());
+ tAgreementService.updateById(agreement1);
+ }
+
return SUCCESS_TIP;
}
@@ -280,4 +308,20 @@
public Object detail(@PathVariable("tAgreementId") Integer tAgreementId) {
return tAgreementService.selectById(tAgreementId);
}
+
+
+ /**
+ * 获取协议
+ * @param language
+ * @param type
+ * @param useType
+ * @return
+ */
+ @RequestMapping(value = "/getAgreement")
+ @ResponseBody
+ public TAgreement getAgreement(Integer language, Integer type, Integer useType){
+ TAgreement tAgreement = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", type)
+ .eq("useType", useType).eq("language", language));
+ return tAgreement;
+ }
}
--
Gitblit v1.7.1