Merge remote-tracking branch 'origin/master'

huangzhen

2023-09-25 1614615fc9319b8626eb028598b894311992c033

 exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/TrainingInstitutionController.java

@@ -7,6 +7,10 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -18,6 +22,7 @@
 * @author makejava
 * @since 2023-09-13 16:12:31
 */
@Api(tags = "培训机构接口")
@RestController
@RequestMapping("training/institution")
public class TrainingInstitutionController extends BaseController {
@@ -33,6 +38,11 @@
     * @param query 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "pageNum", dataTypeClass = String.class,value = "页码",required = true),
            @ApiImplicitParam(name = "pageSize", dataTypeClass = String.class,value = "页数",required = true),
    })
    @GetMapping("page/list")
    public TableDataInfo listByPage(TrainingInstitutionQuery query) {
        startPage();
@@ -45,6 +55,7 @@
     * @param institutionId 主键
     * @return 单条数据
     */
    @ApiOperation(value = "通过主键查询单条数据")
    @GetMapping("get/{institutionId}")
    public AjaxResult selectOne(@PathVariable Long institutionId) {
        return success(this.trainingInstitutionService.getById(institutionId));
@@ -56,6 +67,7 @@
     * @param addForm 实体对象
     * @return 新增结果
     */
    @ApiOperation(value = "新增数据")
    @PostMapping("add")
    public AjaxResult add(@Validated @RequestBody TrainingInstitutionAddForm addForm) {
        return toAjax(this.trainingInstitutionService.add(addForm));
@@ -67,7 +79,8 @@
     * @param modForm 实体对象
     * @return 修改结果
     */
    @PutMapping("mod")
    @ApiOperation(value = "修改数据")
    @PostMapping("mod")
    public AjaxResult mod(@Validated @RequestBody TrainingInstitutionModForm modForm) {
        return toAjax(this.trainingInstitutionService.mod(modForm));
    }
@@ -78,13 +91,16 @@
     * @param institutionIds 主键结合
     * @return 删除结果
     */
    @ApiOperation(value = "删除数据")
    @DeleteMapping("/del/batch/{institutionIds}")
    public AjaxResult delete(@PathVariable("institutionIds") List<Long> institutionIds) {
        return toAjax(this.trainingInstitutionService.removeByIds(institutionIds));
    public AjaxResult delBatch(@PathVariable("institutionIds") List<Long> institutionIds) {
        this.trainingInstitutionService.delBatch(institutionIds);
        return success();
    }
    /**
     * 选择列表
     */
    @ApiOperation(value = "选择列表")
    @GetMapping("select")
    public AjaxResult selectList(TrainingInstitutionQuery query){
        return success(this.trainingInstitutionService.listByPage(query));