pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
@@ -90,7 +90,12 @@ * @return */ public QueryResultVo<List<VoOpenCloseValve>> getOpenCloseValveReports_history(OpenCloseValveQO qo) { qo.completionTimeNoEmpty() ; //下面由completionTimeNoEmpty()改为completionTime()原因， //开关阀记录中开阀时间和关阀时间有时不会同时有值，可能其中任一个是null值，如果用时间条件查询，则这样的记录就查不出来了。 //如果要缩小所查询记录的范围（数量），则可从记录ID上设备一个范围。 //qo.completionTimeNoEmpty() ; qo.completionTime() ; Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo); Long itemTotal = rmOpenCloseValveHistoryMapper.getOpenCloseValveReportsCount_history(params); pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OpenCloseValveQO.java
@@ -62,17 +62,17 @@ public void completionTime(){ if(timeStart_open != null && timeStart_open.trim().equals("")) { if(timeStart_open != null && !timeStart_open.trim().equals("")) { timeStart_open = timeStart_open + " 00:00:00"; } if(timeStop_open != null && timeStop_open.trim().equals("")) { if(timeStop_open != null && !timeStop_open.trim().equals("")) { timeStop_open = timeStop_open + " 23:59:59"; } if(timeStart_close != null && timeStart_close.trim().equals("")) { if(timeStart_close != null && !timeStart_close.trim().equals("")) { timeStart_close = timeStart_close + " 00:00:00"; } if(timeStop_close != null && timeStop_close.trim().equals("")) { if(timeStop_close != null && !timeStop_close.trim().equals("")) { timeStop_close = timeStop_close + " 23:59:59"; } }
