Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r41643 -r41650 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 41643) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 41650) @@ -3480,15 +3480,9 @@ if(param.getIsBeforeModeForWashTime() != null && StringUtils.isNotBlank(param.getFilterWashTime())){ if(param.getIsBeforeModeForWashTime()){//之前 - return " and exists (select 1 from "+ WashAndDisinfectRecord.class.getSimpleName() - +" wr where wr.id=po.washRecord_id and wr.startDate <= " - + dateQueryAdapter.dateAdapter(param.getFilterWashTime() + ":00") - +") "; + return " and po.washTime <= '"+ param.getFilterWashTime() + ":00' "; }else{//之后 - return " and exists (select 1 from "+ WashAndDisinfectRecord.class.getSimpleName() - +" wr where wr.id=po.washRecord_id and wr.startDate >= " - + dateQueryAdapter.dateAdapter(param.getFilterWashTime() + ":00") - +") "; + return " and po.washTime >= '"+ param.getFilterWashTime() + ":00' "; } } return StringUtils.EMPTY; Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskTaskParam.java =================================================================== diff -u -r41635 -r41650 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskTaskParam.java (.../WaitPackingTaskTaskParam.java) (revision 41635) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskTaskParam.java (.../WaitPackingTaskTaskParam.java) (revision 41650) @@ -8,7 +8,6 @@ * 清洗时间过滤 * 精确到分 * PackingTask.WashTime是个字符串 - * 过滤的不是PackingTask.WashTime,而是PackingTask.washRecord_id的清洗记录的清洗开始时间startDate */ private String filterWashTime; /**