Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 src/main/java/com/ots/project/exam/controller/TSubjectController.java

@@ -1,5 +1,4 @@
package com.ots.project.exam.controller;

import com.ots.common.utils.poi.ExcelUtil;
import com.ots.framework.aspectj.lang.annotation.Log;
import com.ots.framework.aspectj.lang.enums.BusinessType;
@@ -13,32 +12,20 @@
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * 维度表Controller
 *
 * @author ots
 * @date 2019-12-09
 */
@Controller
@RequestMapping("/exam/subject")
public class TSubjectController extends BaseController {
    private String prefix = "exam/subject";

    @Autowired
    private ITSubjectService tSubjectService;

    @RequiresPermissions("exam:subject:view")
    @GetMapping()
    public String subject() {
        return prefix + "/subject";
    }

    /**
     * 查询维度表列表
     */
    @RequiresPermissions("exam:subject:list")
    @PostMapping("/list")
    @ResponseBody
@@ -48,9 +35,6 @@
        return getDataTable(list);
    }

    /**
     * 导出维度表列表
     */
    @RequiresPermissions("exam:subject:export")
    @PostMapping("/export")
    @ResponseBody
@@ -60,17 +44,11 @@
        return util.exportExcel(list, "subject");
    }

    /**
     * 新增维度表
     */
    @GetMapping("/add")
    public String add() {
        return prefix + "/add";
    }

    /**
     * 新增保存维度表
     */
    @RequiresPermissions("exam:subject:add")
    @Log(title = "维度表", businessType = BusinessType.INSERT)
    @PostMapping("/add")
@@ -79,9 +57,6 @@
        return toAjax(tSubjectService.insertTSubject(tSubject));
    }

    /**
     * 修改维度表
     */
    @GetMapping("/edit/{id}")
    public String edit(@PathVariable("id") Long id, ModelMap mmap) {
        TSubject tSubject = tSubjectService.selectTSubjectById(id);
@@ -89,9 +64,6 @@
        return prefix + "/edit";
    }

    /**
     * 修改保存维度表
     */
    @RequiresPermissions("exam:subject:edit")
    @Log(title = "维度表", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
@@ -100,9 +72,6 @@
        return toAjax(tSubjectService.updateTSubject(tSubject));
    }

    /**
     * 删除维度表
     */
    @RequiresPermissions("exam:subject:remove")
    @Log(title = "维度表", businessType = BusinessType.DELETE)
    @PostMapping("/remove")