违章

zf

2023-09-14 704ea6024361970e2c99f21c12d0f0d88d0f1942

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

@@ -2,20 +2,16 @@



import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.exam.noncoalmine.entity.WorkRegistration;
import com.gkhy.exam.noncoalmine.model.addForm.WorkRegistrationAddForm;
import com.gkhy.exam.noncoalmine.model.modForm.WorkRegistrationModForm;
import com.gkhy.exam.noncoalmine.model.query.WorkRegistrationQuery;
import com.gkhy.exam.noncoalmine.service.WorkRegistrationService;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;

/**
@@ -36,13 +32,13 @@
    /**
     * 分页查询所有数据
     *
     * @param workRegistration 查询实体
     * @param query 查询实体
     * @return 所有数据
     */
    @GetMapping()
    public TableDataInfo listByPage( WorkRegistration workRegistration) {
    @GetMapping("/list/page")
    public TableDataInfo listByPage(WorkRegistrationQuery query) {
        startPage();
        return getDataTable(this.workRegistrationService.listByPage(workRegistration));
        return getDataTable(this.workRegistrationService.listByPage(query));
    }

    /**