From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/java/com/ots/project/exam/controller/TReportTemplateController.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/controller/TReportTemplateController.java b/src/main/java/com/ots/project/exam/controller/TReportTemplateController.java
index 7085583..8177709 100644
--- a/src/main/java/com/ots/project/exam/controller/TReportTemplateController.java
+++ b/src/main/java/com/ots/project/exam/controller/TReportTemplateController.java
@@ -6,7 +6,9 @@
import com.ots.framework.web.controller.BaseController;
import com.ots.framework.web.domain.AjaxResult;
import com.ots.framework.web.page.TableDataInfo;
+import com.ots.project.exam.domain.EntEmailTemplate;
import com.ots.project.exam.domain.TReportTemplate;
+import com.ots.project.exam.service.IEntEmailTemplateService;
import com.ots.project.exam.service.ITReportTemplateService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +32,9 @@
@Autowired
private ITReportTemplateService tReportTemplateService;
+
+ @Autowired
+ private IEntEmailTemplateService entEmailTemplateService;
@RequiresPermissions("exam:template:view")
@GetMapping()
@@ -115,4 +120,31 @@
public AjaxResult remove(String ids) {
return toAjax(tReportTemplateService.deleteTReportTemplateByIds(ids));
}
+
+
+ /**
+ * 閭欢妯℃澘閰嶇疆
+ * @return
+ */
+ @RequiresPermissions("exam:email:edit")
+ @GetMapping("/emailEdit")
+ public String emailEdit(ModelMap mmap) {
+ EntEmailTemplate eet = entEmailTemplateService.getOnly();
+ mmap.put("emailTemplate",eet);
+ return prefix + "/emailEdit";
+ }
+
+ /**
+ * 鏂板淇濆瓨閭欢妯℃澘閰嶇疆
+ */
+ @RequiresPermissions("exam:email:edit")
+ @Log(title = "閭欢妯℃澘閰嶇疆", businessType = BusinessType.INSERT)
+ @PostMapping("/emailEdit")
+ @ResponseBody
+ public AjaxResult emailEdit(EntEmailTemplate entEmailTemplate) {
+ if(entEmailTemplate.getId() == null){
+ return error("鏈垵濮嬪寲妯℃澘锛岃仈绯荤鐞嗗憳锛�");
+ }
+ return toAjax(entEmailTemplateService.insertEntEmailTemplate(entEmailTemplate));
+ }
}
--
Gitblit v1.9.1