From 49067588d021a8dce13d9857c4a032daaa68f646 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 12 五月 2025 09:34:15 +0800
Subject: [PATCH] 订单下发接口优化
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 1 -
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 4 ++--
ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java | 2 +-
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java | 2 +-
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 5 +++--
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
index 765db87..3636061 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
@@ -124,5 +124,5 @@
WorkOrderDetailVO detailByNoButNoDistributeRecord(String workOrderNo);
- List<WorkOrderVO> distributeList(Date startDate, Date endDate);
+ List<WorkOrderVO> distributeList();
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
index cb93a9b..d09037a 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -127,7 +127,7 @@
*/
Result distributePage(DistributeWorkOrderQuery query);
- List<WorkOrderVO> distributeList(Date startDate, Date endDate);
+ List<WorkOrderVO> distributeList();
/**
* 蹇�熶笅鍙�
* @param data
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
index 0be079c..65543d8 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
@@ -1374,10 +1374,11 @@
resultCount.add(0, totalCount + "");
BigDecimal onlineRate = BigDecimal.ZERO;
+
+
// 1锛氬畬鏁� 0锛氶棿姝� -1锛氬紓甯� |
if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
- //resultCount.get(0)
- onlineRate = new BigDecimal(resultCount.get(1)).divide(new BigDecimal(uniqueDeviceIdCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+ onlineRate = new BigDecimal(uniqueDeviceIdCount).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
resultCount.add(this.remove0(onlineRate));
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index c4c9ebc..e022a25 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -807,8 +807,8 @@
}
@Override
- public List<WorkOrderVO> distributeList(Date startDate, Date endDate){
- return baseMapper.distributeList(startDate,endDate);
+ public List<WorkOrderVO> distributeList(){
+ return baseMapper.distributeList();
}
@Override
diff --git a/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java b/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java
index cdec41f..55403c3 100644
--- a/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java
@@ -92,7 +92,7 @@
Date startDate = DateUtils.getDayStart(now);
Date endDate = DateUtils.getDayEnd(now);
//鑾峰緱浠婃棩宸ュ崟
- List<WorkOrderVO> list = workOrderService.distributeList(startDate,endDate);
+ List<WorkOrderVO> list = workOrderService.distributeList();
log.error("鑾峰緱宸ュ崟:{}",list);
List<String> workOrderNos = new ArrayList<>();
for (WorkOrderVO workOrderVO : list){
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 10c2fcd..e06eae5 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -187,7 +187,6 @@
LEFT JOIN sys_user su ON su.user_id = odr.user_id
WHERE
wo.deleted = 0
- AND wo.create_time BETWEEN #{startDate} AND #{endDate}
AND wo.status = 'WAIT_DISTRIBUTE'
GROUP BY
wo.id, wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, tm.name, wo.yw_handle_time,
--
Gitblit v1.8.0