From 441a445223b4ec4a6517065d55f4a7f3bfb0a186 Mon Sep 17 00:00:00 2001
From: wanglizhong <wlz>
Date: 星期五, 02 五月 2025 23:28:18 +0800
Subject: [PATCH] feat:增加车辆及车辆配置GPS
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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..901c977 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,14 @@
package com.ruoyi.web.controller.system;
import java.util.List;
+import java.util.Objects;
+import java.text.SimpleDateFormat;
+
+import com.ruoyi.common.annotation.Anonymous;
+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,14 +28,13 @@
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;
/**
* 鏈嶅姟璁㈠崟 淇℃伅鎿嶄綔澶勭悊
- *
+ *
* @author ruoyi
*/
@RestController
@@ -43,9 +50,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)
@@ -66,8 +81,9 @@
return success(serviceOrderService.selectServiceOrderById(serviceOrdId));
}
- /**
- * 鏂板鏈嶅姟璁㈠崟
+
+ /*
+ 鏂板璁㈠崟
*/
@PreAuthorize("@ss.hasPermi('system:order:add')")
@Log(title = "鏈嶅姟璁㈠崟", businessType = BusinessType.INSERT)
--
Gitblit v1.9.1