From 0202954390f0b28bb093e0c5100ae026ba27559a Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期五, 26 一月 2024 10:35:32 +0800
Subject: [PATCH] change timeFilter
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
index 5360a14..1d65de6 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
@@ -1,7 +1,12 @@
package com.jcdm.main.bs.orderScheduling.controller;
+import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.jcdm.common.core.domain.R;
+import com.jcdm.common.utils.StringUtils;
+import com.jcdm.main.bs.orderScheduling.vo.LineChartVO;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -25,7 +30,7 @@
* 璁㈠崟鎺掍骇Controller
*
* @author jiang
- * @date 2024-01-09
+ * @date 2024-01-13
*/
@RestController
@RequestMapping("/bs/orderScheduling")
@@ -47,6 +52,30 @@
}
/**
+ * 鏌ヨ涓嬬嚎鏁伴噺
+ */
+ @PreAuthorize("@ss.hasPermi('bs:orderScheduling:list')")
+ @GetMapping("/getOffLineNum")
+ public TableDataInfo getOffLineNum(BsOrderScheduling bsOrderScheduling)
+ {
+
+ List<LineChartVO> vo = bsOrderSchedulingService.getOffLineNum();
+ return getDataTable(vo);
+ }
+
+ @PreAuthorize("@ss.hasPermi('bs:orderScheduling:list')")
+ @GetMapping("/list2")
+ public TableDataInfo list2(BsOrderScheduling bsOrderScheduling)
+ {
+// startPage();
+ List<BsOrderScheduling> list = new ArrayList<>();
+ if (StringUtils.isNotEmpty(bsOrderScheduling.getOrderNo())){
+ list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling);
+ }
+ return getDataTable(list);
+ }
+
+ /**
* 瀵煎嚭璁㈠崟鎺掍骇鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('bs:orderScheduling:export')")
@@ -63,10 +92,10 @@
* 鑾峰彇璁㈠崟鎺掍骇璇︾粏淇℃伅
*/
@PreAuthorize("@ss.hasPermi('bs:orderScheduling:query')")
- @GetMapping(value = "/{orderNumber}")
- public AjaxResult getInfo(@PathVariable("orderNumber") String orderNumber)
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
{
- return success(bsOrderSchedulingService.selectBsOrderSchedulingByOrderNumber(orderNumber));
+ return success(bsOrderSchedulingService.selectBsOrderSchedulingById(id));
}
/**
@@ -96,9 +125,9 @@
*/
@PreAuthorize("@ss.hasPermi('bs:orderScheduling:remove')")
@Log(title = "璁㈠崟鎺掍骇", businessType = BusinessType.DELETE)
- @DeleteMapping("/{orderNumbers}")
- public AjaxResult remove(@PathVariable String[] orderNumbers)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
{
- return toAjax(bsOrderSchedulingService.deleteBsOrderSchedulingByOrderNumbers(orderNumbers));
+ return toAjax(bsOrderSchedulingService.deleteBsOrderSchedulingByIds(ids));
}
}
--
Gitblit v1.9.3