From a606bc5b0af6bc85b8ce2bca66a1d74fac3751b7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 22 七月 2024 17:19:09 +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 | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 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..9baf926 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
@@ -199,6 +199,18 @@
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";
+ }
+
/**
* 修改协议
@@ -280,4 +292,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