From 8728733ad60e1698bb6cf0fa2e428c28a6bffbe7 Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期二, 06 四月 2021 10:34:12 +0800
Subject: [PATCH] 需求提交。
---
src/main/java/com/ots/project/exam/controller/EntTestPackageController.java | 132 +++++++++++++++++++++++---------------------
1 files changed, 69 insertions(+), 63 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/controller/EntTestPackageController.java b/src/main/java/com/ots/project/exam/controller/EntTestPackageController.java
index e34d01c..cf80d92 100644
--- a/src/main/java/com/ots/project/exam/controller/EntTestPackageController.java
+++ b/src/main/java/com/ots/project/exam/controller/EntTestPackageController.java
@@ -11,12 +11,10 @@
import com.ots.framework.web.domain.AjaxResult;
import com.ots.framework.web.page.TableDataInfo;
import com.ots.project.exam.domain.EntDemographyParam;
+import com.ots.project.exam.domain.EntEmailTemplate;
import com.ots.project.exam.domain.EntTestPackage;
import com.ots.project.exam.domain.SysUserExtend;
-import com.ots.project.exam.service.IEntDemographyParamService;
-import com.ots.project.exam.service.IEntTestPackageService;
-import com.ots.project.exam.service.ISysUserExtendService;
-import com.ots.project.exam.service.ITReportTemplateService;
+import com.ots.project.exam.service.*;
import com.ots.project.system.user.domain.User;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jetbrains.annotations.NotNull;
@@ -59,13 +57,16 @@
@Autowired
private ITReportTemplateService reportTemplateService;
+ @Autowired
+ private IEntEmailTemplateService entEmailTemplateService;
+
@RequiresPermissions("exam:test_package:view")
@GetMapping()
public String test_package() {
return prefix + "/test_package";
}
- @RequiresPermissions("exam:test_package:search")
+ @RequiresPermissions("exam:test_package:view")
@GetMapping("/searchTestPackage")
public String search(String testName, ModelMap mmap) {
if (Objects.nonNull(testName)) {
@@ -150,67 +151,14 @@
mmap.put("roles", list);
//鎶ュ憡妯℃澘缂栫爜 t_report_template
// mmap.put("templateList", reportTemplateService.getReportTemplates(ShiroUtils.getSysUser()));
- mmap.put("template", getTemplate());
+// mmap.put("template", getTemplate());
+ //榛樿閭欢鍐呭妯℃澘閰嶇疆
+ EntEmailTemplate eet = entEmailTemplateService.getOnly();
+ mmap.put("eet", eet);
SysUserExtend sysUserExtend = sysUserExtendService.selectSysUserExtendById(ShiroUtils.getUserId());
String mailContent = sysUserExtend.getMailContent();
- if (StringUtils.isBlank(mailContent)) {
- mailContent = getHrTemplate();
- }
- mmap.put("hrTemplate", mailContent);
+ mmap.put("hrTemplate",mailContent);
return prefix + "/add";
- }
-
- @NotNull
- private String getHrTemplate() {
- String template = "浜茬埍鐨剓Company}浜哄姏璧勬簮閮紝\n" +
- "Dear HR Staff at {Company},\n" +
- "喙�喔｀傅喔⑧笝喔澿箞喔侧涪喔氞父喔勦竸喔ム競喔竾 {Company}\n" +
- "\n" +
- "闄勪欢鏄瘂FullName} 鏈�杩戝畬鎴愮殑{prodName}娴嬭瘎鎶ュ憡銆俓n" +
- "Attached please find the assessment report on {prodName} of {FullName}\n" +
- "喔佮福喔膏笓喔侧笗喔｀抚喔堗釜喔笟喙�喔竵喔覆喔｀箒喔權笟 喔傕腑喔� {FullName} 喔傕腑喔� {prodName}. \n" +
- "\n" +
- "濡傛湁鐤戦棶锛岃涓庡鏈嶈仈绯伙紝閭鏄細support@tai-online.com銆俓n" +
- "Should you have questions, please contact our customer service at support@tai-online.com. \n" +
- "喔覆喔佮浮喔掂競喙夃腑喔竾喔副喔⑧斧喔｀阜喔竸喔赤笘喔侧浮喙�喔炧复喙堗浮喙�喔曕复喔� 喔佮福喔膏笓喔侧笗喔脆笖喔曕箞喔笣喙堗覆喔⑧笟喔｀复喔佮覆喔｀弗喔灌竵喔勦箟喔侧釜喔编浮喔炧副喔權笜喙� 喔椸傅喙� support@tai-online.com\n" +
- "\n" +
- "\n" +
- "璋㈣阿锛乗n" +
- "All the best,\n" +
- "喔傕腑喔傕腑喔氞竸喔膏笓喙�喔涏箛喔權腑喔⑧箞喔侧竾喔⑧复喙堗竾\n" +
- "\n" +
- "\n" +
- "TAI鍏徃瀹㈡埛鏈嶅姟閮╘n" +
- "Customer Service Dept., TAI, LLC\n" +
- "喔澿箞喔侧涪喔氞福喔脆竵喔侧福喔ム腹喔佮竸喙夃覆喔副喔∴笧喔编笝喔樴箤喔氞福喔脆俯喔� TAI";
- return template;
- }
-
- @NotNull
- private String getTemplate() {
- String template = "浜茬埍鐨剓FullName},\n" +
- "<br>Dear {FullName},\n" +
- "<br>喙�喔｀傅喔⑧笝 {FullName},\n" +
- "<br>\n" +
- "<br>{Company} 閭�璇锋偍瀹屾垚涓�浠芥祴璇曪紝澶ф闇�瑕�20-25鍒嗛挓鏃堕棿銆傛偍鍙互鐩存帴鐐瑰嚮涓嬮潰鐨勯摼鎺ュ紑濮嬭娴嬭瘯銆傚鏋滀笉鑳界洿鎺ヨ闂紝璇峰鍒跺湴鍧�鍒版祻瑙堝櫒涓洿鎺ユ墦寮�銆俓n" +
- "<br>You've been invited to take an assessment by {Company}, which shall take about 20-25 minutes to complete. Please click the link below, or copy the link to your browser, to begin the assessment.\n" +
- "<br>喔勦父喔撪箘喔斷箟喔｀副喔氞箑喔娻复喔嵿箖喔箟喔椸赋喙佮笟喔氞笡喔｀赴喙�喔∴复喔權笀喔侧竵 {Company} 喔佮福喔膏笓喔侧箖喔娻箟喔ム复喔囙竸喙屶笖喙夃覆喔權弗喙堗覆喔囙箑喔炧阜喙堗腑喙�喔｀复喙堗浮喔斷赋喙�喔權复喔權竵喔侧福 喙傕笖喔⑧竸喔膏笓喔覆喔∴覆喔｀笘喔勦弗喔脆竵喔椸傅喙堗弗喔脆竾喔勦箤喔斷箟喔侧笝喔ム箞喔侧竾喙傕笖喔⑧笗喔｀竾 喔福喔粪腑喔堗赴喔勦副喔斷弗喔竵喙佮弗喙夃抚喔權赋喔ム复喔囙竸喙屶箘喔涏抚喔侧竾喔氞笝喙�喔氞福喔侧抚喙屶箑喔嬥腑喔｀箤喔傕腑喔囙竸喔膏笓喔佮箛喙勦笖喙塡n" +
- "<br>閾炬帴鍦板潃鏄細<a href='{url}' target='_blank'>{url}</a>\n" +
- "<br>The link is: <a href='{url}' target='_blank'>{url}</a>\n" +
- "<br>喔曕覆喔∴弗喔脆竾喔勦箤喔權傅喙�: <a href='{url}' target='_blank'>{url}</a>\n" +
- "<br>\n" +
- "<br>濡傛湁鐤戦棶锛岃涓庡鏈嶈仈绯伙紝閭鏄細support@tai-online.com銆俓n" +
- "<br>Should you have problem assessing the above link, please contact our customer service at support@tai-online.com.\n" +
- "<br>喔覆喔佮竸喔膏笓喔∴傅喔涏副喔嵿斧喔侧箖喔權竵喔侧福喙�喔傕箟喔侧釜喔灌箞喔ム复喔囙竸喙屶競喙夃覆喔囙笗喙夃笝 喙傕笡喔｀笖喔曕复喔斷笗喙堗腑喔澿箞喔侧涪喔氞福喔脆竵喔侧福喔ム腹喔佮竸喙夃覆喔傕腑喔囙箑喔｀覆喔椸傅喙� support@tai-online.com\n" +
- "<br>\n" +
- "<br>\n" +
- "<br>璋㈣阿锛乗n" +
- "<br>All the best,\n" +
- "<br>喔斷箟喔о涪喔勦抚喔侧浮喙�喔勦覆喔｀笧\n" +
- "<br>\n" +
- "<br>{Company}\n" +
- "<br>";
- return template;
}
/**
@@ -270,6 +218,12 @@
});
}
mmap.put("roles", list);
+ //榛樿閭欢鍐呭妯℃澘閰嶇疆
+ EntEmailTemplate eet = entEmailTemplateService.getOnly();
+ mmap.put("eet", eet);
+ SysUserExtend sysUserExtend = sysUserExtendService.selectSysUserExtendById(ShiroUtils.getUserId());
+ String mailContent = sysUserExtend.getMailContent();
+ mmap.put("hrTemplate",mailContent);
//鎶ュ憡妯℃澘缂栫爜 t_report_template
mmap.put("templateList", reportTemplateService.getReportTemplates(ShiroUtils.getSysUser(), entTestPackage.getProdId()));
@@ -298,5 +252,57 @@
return toAjax(entTestPackageService.deleteEntTestPackageByIds(ids));
}
+ @NotNull
+ private String getHrTemplate() {
+ String template = "浜茬埍鐨剓Company}浜哄姏璧勬簮閮紝\n" +
+ "Dear HR Staff at {Company},\n" +
+ "喙�喔｀傅喔⑧笝喔澿箞喔侧涪喔氞父喔勦竸喔ム競喔竾 {Company}\n" +
+ "\n" +
+ "闄勪欢鏄瘂FullName} 鏈�杩戝畬鎴愮殑{prodName}娴嬭瘎鎶ュ憡銆俓n" +
+ "Attached please find the assessment report on {prodName} of {FullName}\n" +
+ "喔佮福喔膏笓喔侧笗喔｀抚喔堗釜喔笟喙�喔竵喔覆喔｀箒喔權笟 喔傕腑喔� {FullName} 喔傕腑喔� {prodName}. \n" +
+ "\n" +
+ "濡傛湁鐤戦棶锛岃涓庡鏈嶈仈绯伙紝閭鏄細support@tai-online.com銆俓n" +
+ "Should you have questions, please contact our customer service at support@tai-online.com. \n" +
+ "喔覆喔佮浮喔掂競喙夃腑喔竾喔副喔⑧斧喔｀阜喔竸喔赤笘喔侧浮喙�喔炧复喙堗浮喙�喔曕复喔� 喔佮福喔膏笓喔侧笗喔脆笖喔曕箞喔笣喙堗覆喔⑧笟喔｀复喔佮覆喔｀弗喔灌竵喔勦箟喔侧釜喔编浮喔炧副喔權笜喙� 喔椸傅喙� support@tai-online.com\n" +
+ "\n" +
+ "\n" +
+ "璋㈣阿锛乗n" +
+ "All the best,\n" +
+ "喔傕腑喔傕腑喔氞竸喔膏笓喙�喔涏箛喔權腑喔⑧箞喔侧竾喔⑧复喙堗竾\n" +
+ "\n" +
+ "\n" +
+ "TAI鍏徃瀹㈡埛鏈嶅姟閮╘n" +
+ "Customer Service Dept., TAI, LLC\n" +
+ "喔澿箞喔侧涪喔氞福喔脆竵喔侧福喔ム腹喔佮竸喙夃覆喔副喔∴笧喔编笝喔樴箤喔氞福喔脆俯喔� TAI";
+ return template;
+ }
+
+ @NotNull
+ private String getTemplate() {
+ String template = "浜茬埍鐨剓FullName},\n" +
+ "<br>Dear {FullName},\n" +
+ "<br>喙�喔｀傅喔⑧笝 {FullName},\n" +
+ "<br>\n" +
+ "<br>{Company} 閭�璇锋偍瀹屾垚涓�浠芥祴璇曪紝澶ф闇�瑕�20-25鍒嗛挓鏃堕棿銆傛偍鍙互鐩存帴鐐瑰嚮涓嬮潰鐨勯摼鎺ュ紑濮嬭娴嬭瘯銆傚鏋滀笉鑳界洿鎺ヨ闂紝璇峰鍒跺湴鍧�鍒版祻瑙堝櫒涓洿鎺ユ墦寮�銆俓n" +
+ "<br>You've been invited to take an assessment by {Company}, which shall take about 20-25 minutes to complete. Please click the link below, or copy the link to your browser, to begin the assessment.\n" +
+ "<br>喔勦父喔撪箘喔斷箟喔｀副喔氞箑喔娻复喔嵿箖喔箟喔椸赋喙佮笟喔氞笡喔｀赴喙�喔∴复喔權笀喔侧竵 {Company} 喔佮福喔膏笓喔侧箖喔娻箟喔ム复喔囙竸喙屶笖喙夃覆喔權弗喙堗覆喔囙箑喔炧阜喙堗腑喙�喔｀复喙堗浮喔斷赋喙�喔權复喔權竵喔侧福 喙傕笖喔⑧竸喔膏笓喔覆喔∴覆喔｀笘喔勦弗喔脆竵喔椸傅喙堗弗喔脆竾喔勦箤喔斷箟喔侧笝喔ム箞喔侧竾喙傕笖喔⑧笗喔｀竾 喔福喔粪腑喔堗赴喔勦副喔斷弗喔竵喙佮弗喙夃抚喔權赋喔ム复喔囙竸喙屶箘喔涏抚喔侧竾喔氞笝喙�喔氞福喔侧抚喙屶箑喔嬥腑喔｀箤喔傕腑喔囙竸喔膏笓喔佮箛喙勦笖喙塡n" +
+ "<br>閾炬帴鍦板潃鏄細<a href='{url}' target='_blank'>{url}</a>\n" +
+ "<br>The link is: <a href='{url}' target='_blank'>{url}</a>\n" +
+ "<br>喔曕覆喔∴弗喔脆竾喔勦箤喔權傅喙�: <a href='{url}' target='_blank'>{url}</a>\n" +
+ "<br>\n" +
+ "<br>濡傛湁鐤戦棶锛岃涓庡鏈嶈仈绯伙紝閭鏄細support@tai-online.com銆俓n" +
+ "<br>Should you have problem assessing the above link, please contact our customer service at support@tai-online.com.\n" +
+ "<br>喔覆喔佮竸喔膏笓喔∴傅喔涏副喔嵿斧喔侧箖喔權竵喔侧福喙�喔傕箟喔侧釜喔灌箞喔ム复喔囙竸喙屶競喙夃覆喔囙笗喙夃笝 喙傕笡喔｀笖喔曕复喔斷笗喙堗腑喔澿箞喔侧涪喔氞福喔脆竵喔侧福喔ム腹喔佮竸喙夃覆喔傕腑喔囙箑喔｀覆喔椸傅喙� support@tai-online.com\n" +
+ "<br>\n" +
+ "<br>\n" +
+ "<br>璋㈣阿锛乗n" +
+ "<br>All the best,\n" +
+ "<br>喔斷箟喔о涪喔勦抚喔侧浮喙�喔勦覆喔｀笧\n" +
+ "<br>\n" +
+ "<br>{Company}\n" +
+ "<br>";
+ return template;
+ }
}
--
Gitblit v1.9.1