From 255cb7db32a21f0b3b7c47d812ab0c3f1a3e21c1 Mon Sep 17 00:00:00 2001 From: jason Date: Tue, 11 Mar 2025 14:54:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBug=EF=BC=9A45549=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=87=E8=B4=A6=E6=97=A5=E6=9C=9F=E8=B5=B7?= =?UTF-8?q?=E5=A7=8B-=E8=BF=87=E8=B4=A6=E6=97=A5=E6=9C=9F=E6=88=AA?= =?UTF-8?q?=E6=AD=A2=E7=9A=84=20=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/MesWorkOrderLogService.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderLogService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderLogService.java index a80ec8b..c46e4a1 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderLogService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderLogService.java @@ -90,6 +90,13 @@ public class MesWorkOrderLogService extends BaseMesService impl sql += " and wol.modify_date_time <:endTime "; } + if (!StringUtil.isEmpty(mesWorkOrderLog.getActualPostingDateStart())) { + sql += " and wol.description >=:postingStartTime "; + } + if (!StringUtil.isEmpty(mesWorkOrderLog.getActualPostingDateEnd())) { + sql += " and wol.description <:postingEndTime "; + } + if (!StringUtil.isEmpty(mesWorkOrderLog.getWorkOrderNo())) { sql += " and wol.work_order_no ='" + mesWorkOrderLog.getWorkOrderNo() + "' "; } @@ -115,6 +122,13 @@ public class MesWorkOrderLogService extends BaseMesService impl queryObject.setParameter("endTime", endTime); } + if (!StringUtil.isEmpty(mesWorkOrderLog.getActualPostingDateStart())) { + queryObject.setParameter("postingStartTime", mesWorkOrderLog.getActualPostingDateStart()); + } + if (!StringUtil.isEmpty(mesWorkOrderLog.getActualPostingDateEnd())) { + queryObject.setParameter("postingEndTime", mesWorkOrderLog.getActualPostingDateEnd()); + } + queryObject.unwrap(SQLQuery.class).setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); List> hashMaps = queryObject.getResultList();