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/EntTestPackageController.java | 235 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 150 insertions(+), 85 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 cb71242..cd3da43 100644
--- a/src/main/java/com/ots/project/exam/controller/EntTestPackageController.java
+++ b/src/main/java/com/ots/project/exam/controller/EntTestPackageController.java
@@ -10,13 +10,11 @@
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.EntTestMember;
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;
@@ -35,24 +33,50 @@
import java.util.stream.Collectors;
import static com.ots.common.enums.UserTypeEnum.SYS_USER;
+/**
+ * 娴嬭瘯鍖呯鐞咰ontroller
+ *
+ * @author ots
+ * @date 2019-11-27
+ */
@Controller
@RequestMapping("/exam/test_package")
public class EntTestPackageController extends BaseController {
private String prefix = "exam/test_package";
+
@Autowired
private IEntTestPackageService entTestPackageService;
+
@Autowired
private IEntDemographyParamService entDemographyParamService;
+
@Autowired
private ISysUserExtendService sysUserExtendService;
+
@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:view")
+ @GetMapping("/searchTestPackage")
+ public String search(String testName, ModelMap mmap) {
+ if (Objects.nonNull(testName)) {
+ mmap.put("testName", testName);
+ }
+ return prefix + "/test_package";
+ }
+
+ /**
+ * 鏌ヨ娴嬭瘯鍖呯鐞嗗垪琛�
+ */
@RequiresPermissions("exam:test_package:list")
@PostMapping("/list")
@ResponseBody
@@ -64,7 +88,7 @@
if (UserTypeEnum.ENT_USER.getUserType().equals(userType)) {
entTestPackage.setUserId(sysUser.getUserId());
}
-
+ //鍒嗛攢鍟嗗彲浠ョ湅鍒板垎閿�鍟嗕笅鐨勪紒涓氫俊鎭�
if (UserTypeEnum.DIS_USER.getUserType().equals(userType)) {
SysUserExtend sysUserExtend = new SysUserExtend();
sysUserExtend.setParentUserId(sysUser.getUserId());
@@ -76,7 +100,11 @@
}
return getDataTable(entTestPackageService.selectEntTestPackageList(entTestPackage));
}
-
+
+
+ /**
+ * 鏌ヨ娴嬭瘯鍖呯鐞嗗垪琛�
+ */
@PostMapping("/listTopTestPackage")
@ResponseBody
public TableDataInfo listTopTestPackage(EntTestPackage entTestPackage) {
@@ -85,10 +113,12 @@
if (!SYS_USER.getUserType().equals(sysUser.getUserType())) {
entTestPackage.setUserId(sysUser.getUserId());
}
-
- return getDataTable(entTestPackageService.selectEntTestPackageList(entTestPackage));
+ return getDataTable(entTestPackageService.selectEntTestPackageMainList(entTestPackage));
}
-
+
+ /**
+ * 瀵煎嚭娴嬭瘯鍖呯鐞嗗垪琛�
+ */
@RequiresPermissions("exam:test_package:export")
@PostMapping("/export")
@ResponseBody
@@ -97,7 +127,7 @@
String userType = sysUser.getUserType();
List<Long> userIds = new ArrayList<>();
userIds.add(sysUser.getUserId());
-
+
if (UserTypeEnum.DIS_USER.getUserType().equals(userType)) {
SysUserExtend sysUserExtend = new SysUserExtend();
sysUserExtend.setParentUserId(sysUser.getUserId());
@@ -109,38 +139,134 @@
}
List<EntTestPackage> list = entTestPackageService.selectEntTestPackageList(entTestPackage);
if (!SYS_USER.getUserType().equals(userType)) {
-
+
list = list.stream().filter(p -> userIds.contains(p.getUserId())).collect(Collectors.toList());
}
ExcelUtil<EntTestPackage> util = new ExcelUtil<EntTestPackage>(EntTestPackage.class);
return util.exportExcel(list, "test_package");
}
-
+
+ /**
+ * 鍥炴敹浜烘锛堝洖鏀跺瘑鐮侊級
+ */
@RequiresPermissions("exam:test_package:recover")
@PostMapping("/recover/{testId}")
@ResponseBody
public AjaxResult recover(@PathVariable Long testId) {
return toAjax(entTestPackageService.recover(testId));
}
-
+
+ /**
+ * 鏂板娴嬭瘯鍖呯鐞�
+ */
@GetMapping("/add")
public String add(ModelMap mmap) {
-
+ //澶氳瑷�閫夋嫨
EntDemographyParam entDemographyParam = new EntDemographyParam();
entDemographyParam.setParamStatus("1");
List<EntDemographyParam> list = entDemographyParamService.selectEntDemographyParamList(entDemographyParam);
mmap.put("roles", list);
-
-
- mmap.put("template", getTemplate());
+ //鎶ュ憡妯℃澘缂栫爜 t_report_template
+// mmap.put("templateList", reportTemplateService.getReportTemplates(ShiroUtils.getSysUser()));
+// 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";
}
+
+ /**
+ * 鏍规嵁浜у搧鍖匢D鑾峰彇妯℃澘缂栫爜
+ */
+ @PostMapping("/prodTemplate")
+ @ResponseBody
+ public AjaxResult changeTemplate(Long prodId) {
+ return AjaxResult.success(MessageUtils.message("basis.successfulOperation"), reportTemplateService.getReportTemplates(ShiroUtils.getSysUser(), prodId));
+ }
+
+ /**
+ * 鏂板淇濆瓨娴嬭瘯鍖呯鐞�
+ */
+ @RequiresPermissions("exam:test_package:add")
+ @Log(title = "娴嬭瘯鍖呯鐞�", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ @ResponseBody
+ public AjaxResult addSave(EntTestPackage entTestPackage) {
+ return toAjax(entTestPackageService.insertEntTestPackage(entTestPackage));
+ }
+
+ /**
+ * 淇敼娴嬭瘯鍖呯鐞�
+ */
+ @GetMapping("/edit/{id}")
+ public String edit(@PathVariable("id") Long id, ModelMap mmap) {
+ EntTestPackage entTestPackage = entTestPackageService.selectEntTestPackageById(id);
+ mmap.put("entTestPackage", entTestPackage);
+ EntDemographyParam entDemographyParam = new EntDemographyParam();
+ List<EntDemographyParam> list = entDemographyParamService.selectEntDemographyParamList(entDemographyParam);
+ String paramCodes = entTestPackage.getParamCodes();
+ /**
+ * 榛樿鍏ㄩ儴涓篺alse
+ */
+ if (Objects.nonNull(paramCodes)) {
+ String[] split = paramCodes.split(",");
+ list.forEach(p -> {
+ Arrays.asList(split).forEach(t -> {
+ p.setFlag(false);
+ });
+ });
+ }
+ /**
+ * 瀛樺湪鏁版嵁鍒欐洿鏂颁负true
+ */
+ if (Objects.nonNull(paramCodes)) {
+ String[] split = paramCodes.split(",");
+ list.forEach(p -> {
+ Arrays.asList(split).forEach(t -> {
+ if (Objects.equals(String.valueOf(p.getParamId()), t)) {
+ p.setFlag(true);
+ }
+ });
+ });
+ }
+ 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()));
+ return prefix + "/edit";
+ }
+
+ /**
+ * 淇敼淇濆瓨娴嬭瘯鍖呯鐞�
+ */
+ @RequiresPermissions("exam:test_package:edit")
+ @Log(title = "娴嬭瘯鍖呯鐞�", businessType = BusinessType.UPDATE)
+ @PostMapping("/edit")
+ @ResponseBody
+ public AjaxResult editSave(EntTestPackage entTestPackage) {
+ return toAjax(entTestPackageService.updateEntTestPackage(entTestPackage));
+ }
+
+ /**
+ * 鍒犻櫎娴嬭瘯鍖呯鐞�
+ */
+ @RequiresPermissions("exam:test_package:remove")
+ @Log(title = "娴嬭瘯鍖呯鐞�", businessType = BusinessType.DELETE)
+ @PostMapping("/remove")
+ @ResponseBody
+ public AjaxResult remove(String ids) {
+ return toAjax(entTestPackageService.deleteEntTestPackageByIds(ids));
+ }
+
@NotNull
private String getHrTemplate() {
String template = "浜茬埍鐨剓Company}浜哄姏璧勬簮閮紝\n" +
@@ -166,6 +292,7 @@
"喔澿箞喔侧涪喔氞福喔脆竵喔侧福喔ム腹喔佮竸喙夃覆喔副喔∴笧喔编笝喔樴箤喔氞福喔脆俯喔� TAI";
return template;
}
+
@NotNull
private String getTemplate() {
String template = "浜茬埍鐨剓FullName},\n" +
@@ -192,67 +319,5 @@
"<br>";
return template;
}
-
- @PostMapping("/prodTemplate")
- @ResponseBody
- public AjaxResult changeTemplate(Long prodId) {
- return AjaxResult.success(MessageUtils.message("basis.successfulOperation"), reportTemplateService.getReportTemplates(ShiroUtils.getSysUser(), prodId));
- }
-
- @RequiresPermissions("exam:test_package:add")
- @Log(title = "娴嬭瘯鍖呯鐞�", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- @ResponseBody
- public AjaxResult addSave(EntTestPackage entTestPackage) {
- return toAjax(entTestPackageService.insertEntTestPackage(entTestPackage));
- }
-
- @GetMapping("/edit/{id}")
- public String edit(@PathVariable("id") Long id, ModelMap mmap) {
- EntTestPackage entTestPackage = entTestPackageService.selectEntTestPackageById(id);
- mmap.put("entTestPackage", entTestPackage);
- EntDemographyParam entDemographyParam = new EntDemographyParam();
- List<EntDemographyParam> list = entDemographyParamService.selectEntDemographyParamList(entDemographyParam);
- String paramCodes = entTestPackage.getParamCodes();
-
- if (Objects.nonNull(paramCodes)) {
- String[] split = paramCodes.split(",");
- list.forEach(p -> {
- Arrays.asList(split).forEach(t -> {
- p.setFlag(false);
- });
- });
- }
-
- if (Objects.nonNull(paramCodes)) {
- String[] split = paramCodes.split(",");
- list.forEach(p -> {
- Arrays.asList(split).forEach(t -> {
- if (Objects.equals(String.valueOf(p.getParamId()), t)) {
- p.setFlag(true);
- }
- });
- });
- }
- mmap.put("roles", list);
-
- mmap.put("templateList", reportTemplateService.getReportTemplates(ShiroUtils.getSysUser(), entTestPackage.getProdId()));
- return prefix + "/edit";
- }
-
- @RequiresPermissions("exam:test_package:edit")
- @Log(title = "娴嬭瘯鍖呯鐞�", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
- @ResponseBody
- public AjaxResult editSave(EntTestPackage entTestPackage) {
- return toAjax(entTestPackageService.updateEntTestPackage(entTestPackage));
- }
-
- @RequiresPermissions("exam:test_package:remove")
- @Log(title = "娴嬭瘯鍖呯鐞�", businessType = BusinessType.DELETE)
- @PostMapping("/remove")
- @ResponseBody
- public AjaxResult remove(String ids) {
- return toAjax(entTestPackageService.deleteEntTestPackageByIds(ids));
- }
+
}
--
Gitblit v1.9.1