From afbf429242dbab320dea6e986b9ca3d9ccc01296 Mon Sep 17 00:00:00 2001 From: wzp <2040239371@qq.com> Date: 星期四, 01 五月 2025 11:47:49 +0800 Subject: [PATCH] feat: 增加订单查询管理页面 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java index 9482e69..5b3308c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java @@ -1,6 +1,10 @@ package com.ruoyi.web.controller.system; import java.util.List; + +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.constant.HttpStatus; +import com.ruoyi.common.enums.DataSourceType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -20,8 +24,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.ServiceOrder; import com.ruoyi.system.service.IServiceOrderService; -import com.ruoyi.framework.datasource.annotation.DataSource; -import com.ruoyi.framework.datasource.DataSourceType; + import javax.servlet.http.HttpServletResponse; @@ -43,9 +46,17 @@ @PreAuthorize("@ss.hasPermi('system:order:list')") @GetMapping("/list") public TableDataInfo list(ServiceOrder serviceOrder) { - startPage(); + // 鑾峰彇鎬绘暟 + int total = serviceOrderService.selectServiceOrderCount(serviceOrder); + // 鑾峰彇鍒嗛〉鏁版嵁 List<ServiceOrder> list = serviceOrderService.selectServiceOrderList(serviceOrder); - return getDataTable(list); + // 璁剧疆鎬绘暟 + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("鏌ヨ鎴愬姛"); + rspData.setRows(list); + rspData.setTotal(total); + return rspData; } @Log(title = "鏈嶅姟璁㈠崟", businessType = BusinessType.EXPORT) -- Gitblit v1.9.1