From fc80e4040d6bf39b8657f94df1f957732bae26fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 22 四月 2026 22:02:31 +0800
Subject: [PATCH] 电视机入库出库显示耗时、托数功能修改： 1.入库耗时改成当前订单第一托入库任务创建时间到后续入库的创建时间相减转换成分钟 2.出库耗时改成当前订订单任务创建时间减去到达出库口的耗时时间 3.入库托数改成当前入库订单号累计入库数量
---
src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java b/src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java
index 11a8ec2..9f3d41f 100644
--- a/src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
+import com.zy.asrs.entity.BasCrnErrorLog;
import com.zy.asrs.entity.BasDevpErrorLog;
import com.zy.asrs.service.BasDevpErrorLogService;
import com.core.annotations.ManagerAuth;
@@ -42,10 +43,29 @@
excludeTrash(param);
convert(param, wrapper);
allLike(BasDevpErrorLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (Cools.isEmpty(orderByField)) {
+ wrapper.orderBy("create_time", false);
+ } else {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basDevpErrorLogService.selectPage(new Page<>(curr, limit), wrapper));
}
+ /**
+ * 鏍规嵁绮剧‘鐨� createTime 鏌ヨ
+ */
+ @RequestMapping(value = "/basDevpErrorLog/listByUuid/auth")
+ @ManagerAuth
+ public R listByUuid(@RequestParam String uuid,
+ @RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit) {
+
+ EntityWrapper<BasDevpErrorLog> wrapper = new EntityWrapper<>();
+ wrapper.eq("id", uuid);
+ Page<BasDevpErrorLog> page = basDevpErrorLogService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(page);
+ }
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
--
Gitblit v1.9.1