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();