|
|
|
@ -90,6 +90,13 @@ public class MesWorkOrderLogService extends BaseMesService<MesWorkOrderLog> 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<MesWorkOrderLog> 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<HashMap<String, Object>> hashMaps = queryObject.getResultList();
|
|
|
|
|