Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 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;

/**
 * 人口学信息Controller
 *
 * @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")