From ea09629d8857e0afa329858f72cf1c93e25b813c Mon Sep 17 00:00:00 2001 From: huangzhen <867217663@qq.com> Date: 星期五, 15 九月 2023 10:36:59 +0800 Subject: [PATCH] 煤矿功能实现 --- exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/WorkRegistrationController.java | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/WorkRegistrationController.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/WorkRegistrationController.java index c993f3f..bfab52a 100644 --- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/WorkRegistrationController.java +++ b/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)); } /** -- Gitblit v1.9.2