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/EntTestSendtaskController.java |   46 +++++++---------------------------------------
 1 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/src/main/java/com/ots/project/exam/controller/EntTestSendtaskController.java b/src/main/java/com/ots/project/exam/controller/EntTestSendtaskController.java
index f0c7d6e..29f293a 100644
--- a/src/main/java/com/ots/project/exam/controller/EntTestSendtaskController.java
+++ b/src/main/java/com/ots/project/exam/controller/EntTestSendtaskController.java
@@ -1,5 +1,4 @@
 package com.ots.project.exam.controller;
-
 import com.ots.common.enums.UserTypeEnum;
 import com.ots.common.utils.poi.ExcelUtil;
 import com.ots.common.utils.security.ShiroUtils;
@@ -16,39 +15,26 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 import java.util.Objects;
 
-/**
- * 璇勬祴閭�璇峰彂閫佷换鍔ontroller
- *
- * @author ots
- * @date 2019-12-19
- */
 @Controller
 @RequestMapping("/exam/sendtask")
 public class EntTestSendtaskController extends BaseController {
     private String prefix = "exam/sendtask";
-
     @Autowired
     private IEntTestSendtaskService entTestSendtaskService;
-
     @RequiresPermissions("exam:sendtask:view")
     @GetMapping()
     public String sendtask() {
         return prefix + "/sendtask";
     }
-
     @GetMapping("/condition/{testId}")
     public String hrSendlog(@PathVariable Long testId,ModelMap mmap) {
         mmap.put("testId",testId);
         return prefix + "/sendtask";
     }
-
-    /**
-     * 鏌ヨ璇勬祴閭�璇峰彂閫佷换鍔″垪琛�
-     */
+    
     @RequiresPermissions("exam:sendtask:list")
     @PostMapping("/list")
     @ResponseBody
@@ -64,10 +50,7 @@
         List<EntTestSendtask> list = entTestSendtaskService.selectEntTestSendtaskList(entTestSendtask);
         return getDataTable(list);
     }
-
-    /**
-     * 瀵煎嚭璇勬祴閭�璇峰彂閫佷换鍔″垪琛�
-     */
+    
     @RequiresPermissions("exam:sendtask:export")
     @PostMapping("/export")
     @ResponseBody
@@ -76,18 +59,12 @@
         ExcelUtil<EntTestSendtask> util = new ExcelUtil<EntTestSendtask>(EntTestSendtask.class);
         return util.exportExcel(list, "sendtask");
     }
-
-    /**
-     * 鏂板璇勬祴閭�璇峰彂閫佷换鍔�
-     */
+    
     @GetMapping("/add")
     public String add() {
         return prefix + "/add";
     }
-
-    /**
-     * 鏂板淇濆瓨璇勬祴閭�璇峰彂閫佷换鍔�
-     */
+    
     @RequiresPermissions("exam:sendtask:add")
     @Log(title = "璇勬祴閭�璇峰彂閫佷换鍔�", businessType = BusinessType.INSERT)
     @PostMapping("/add")
@@ -95,20 +72,14 @@
     public AjaxResult addSave(EntTestSendtask entTestSendtask) {
         return toAjax(entTestSendtaskService.insertEntTestSendtask(entTestSendtask));
     }
-
-    /**
-     * 淇敼璇勬祴閭�璇峰彂閫佷换鍔�
-     */
+    
     @GetMapping("/edit/{id}")
     public String edit(@PathVariable("id") Long id, ModelMap mmap) {
         EntTestSendtask entTestSendtask = entTestSendtaskService.selectEntTestSendtaskById(id);
         mmap.put("entTestSendtask", entTestSendtask);
         return prefix + "/edit";
     }
-
-    /**
-     * 淇敼淇濆瓨璇勬祴閭�璇峰彂閫佷换鍔�
-     */
+    
     @RequiresPermissions("exam:sendtask:edit")
     @Log(title = "璇勬祴閭�璇峰彂閫佷换鍔�", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
@@ -116,10 +87,7 @@
     public AjaxResult editSave(EntTestSendtask entTestSendtask) {
         return toAjax(entTestSendtaskService.updateEntTestSendtask(entTestSendtask));
     }
-
-    /**
-     * 鍒犻櫎璇勬祴閭�璇峰彂閫佷换鍔�
-     */
+    
     @RequiresPermissions("exam:sendtask:remove")
     @Log(title = "璇勬祴閭�璇峰彂閫佷换鍔�", businessType = BusinessType.DELETE)
     @PostMapping("/remove")

--
Gitblit v1.9.1