From 901b2ab3e0e7c592602848cfa256f34c5b0c7bb8 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 11 一月 2024 09:57:01 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java
index 263872a..67a1221 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.common.wms.entity.WrkDetl;
import com.zy.asrs.common.wms.entity.WrkDetlLog;
import com.zy.asrs.common.wms.service.WrkDetlLogService;
import com.zy.asrs.framework.annotations.ManagerAuth;
@@ -46,6 +47,10 @@
wrapper.ge(WrkDetlLog::getAppeTime, DateUtils.convert(range[0]));
wrapper.le(WrkDetlLog::getAppeTime, DateUtils.convert(range[1]));
}
+ if (!Cools.isEmpty(param.get("wrk_mast_id"))) {
+ wrapper.eq(WrkDetlLog::getWrkMastId, param.get("wrk_mast_id"));
+ }
+ wrapper.orderByDesc(WrkDetlLog::getId);
return R.ok(wrkDetlLogService.page(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1