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/EntDemographyInfoController.java | 45 +++++++--------------------------------------
1 files changed, 7 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/controller/EntDemographyInfoController.java b/src/main/java/com/ots/project/exam/controller/EntDemographyInfoController.java
index 3032586..db24ed7 100644
--- a/src/main/java/com/ots/project/exam/controller/EntDemographyInfoController.java
+++ b/src/main/java/com/ots/project/exam/controller/EntDemographyInfoController.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;
@@ -17,25 +16,16 @@
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
-
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
-/**
- * 浜哄彛瀛︿俊鎭疌ontroller
- *
- * @author ots
- * @date 2019-12-15
- */
@Controller
@RequestMapping("/exam/info")
public class EntDemographyInfoController extends BaseController {
private String prefix = "exam/info";
-
@Autowired
private IEntDemographyInfoService entDemographyInfoService;
-
@RequiresPermissions("exam:info:view")
@GetMapping()
public ModelAndView info() {
@@ -48,10 +38,7 @@
}
return new ModelAndView(prefix + "/info", new HashMap<>());
}
-
- /**
- * 鏌ヨ浜哄彛瀛︿俊鎭垪琛�
- */
+
@RequiresPermissions("exam:info:list")
@PostMapping("/list")
@ResponseBody
@@ -60,10 +47,7 @@
List<EntDemographyInfo> list = entDemographyInfoService.selectEntDemographyInfoList(entDemographyInfo);
return getDataTable(list);
}
-
- /**
- * 瀵煎嚭浜哄彛瀛︿俊鎭垪琛�
- */
+
@RequiresPermissions("exam:info:export")
@PostMapping("/export")
@ResponseBody
@@ -72,18 +56,12 @@
ExcelUtil<EntDemographyInfo> util = new ExcelUtil<EntDemographyInfo>(EntDemographyInfo.class);
return util.exportExcel(list, "info");
}
-
- /**
- * 鏂板浜哄彛瀛︿俊鎭�
- */
+
@GetMapping("/add")
public String add() {
return prefix + "/add";
}
-
- /**
- * 鏂板淇濆瓨浜哄彛瀛︿俊鎭�
- */
+
@RequiresPermissions("exam:info:add")
@Log(title = "浜哄彛瀛︿俊鎭�", businessType = BusinessType.INSERT)
@PostMapping("/add")
@@ -91,20 +69,14 @@
public AjaxResult addSave(EntDemographyInfo entDemographyInfo) {
return toAjax(entDemographyInfoService.insertEntDemographyInfo(entDemographyInfo));
}
-
- /**
- * 淇敼浜哄彛瀛︿俊鎭�
- */
+
@GetMapping("/edit/{infoId}")
public String edit(@PathVariable("infoId") Long infoId, ModelMap mmap) {
EntDemographyInfo entDemographyInfo = entDemographyInfoService.selectEntDemographyInfoById(infoId);
mmap.put("entDemographyInfo", entDemographyInfo);
return prefix + "/edit";
}
-
- /**
- * 淇敼淇濆瓨浜哄彛瀛︿俊鎭�
- */
+
@RequiresPermissions("exam:info:edit")
@Log(title = "浜哄彛瀛︿俊鎭�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@@ -112,10 +84,7 @@
public AjaxResult editSave(EntDemographyInfo entDemographyInfo) {
return toAjax(entDemographyInfoService.updateEntDemographyInfo(entDemographyInfo));
}
-
- /**
- * 鍒犻櫎浜哄彛瀛︿俊鎭�
- */
+
@RequiresPermissions("exam:info:remove")
@Log(title = "浜哄彛瀛︿俊鎭�", businessType = BusinessType.DELETE)
@PostMapping("/remove")
--
Gitblit v1.9.1