Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java =================================================================== diff -u -r28732 -r28896 --- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java (.../SupplyRoomControlManagerImpl2.java) (revision 28732) +++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java (.../SupplyRoomControlManagerImpl2.java) (revision 28896) @@ -124,7 +124,7 @@ if(isSqlServer){ sql = "select * from ( " + sql + " ) temp2 where rowNo between "+ (pageSize * (pageIndex - 1) + 1) +" and "+ (pageSize * pageIndex) +" order by \"tousseName\" "; }else{ - sql = "select * from ( select rownum as rowno,temp2.* from (" + sql + " ) temp2 where rownum <="+ (pageSize * pageIndex + 1) +" ) temp3 where temp3.rowno>" + (pageSize * (pageIndex - 1) + 1); + sql = "select * from ( select rownum as rowno,temp2.* from (" + sql + " ) temp2 where rownum <="+ (pageSize * pageIndex) +" ) temp3 where temp3.rowno>" + (pageSize * (pageIndex - 1)); } //logger.debug("[RecyclingApplicationSumInfoSql]:" + sql); rs = objectDao.executeSql(sql); @@ -309,7 +309,7 @@ if(isSqlServer){ sql = "select * from ( " + sql + " ) temp2 where rowNo between "+ (pageSize * (pageIndex - 1) + 1) +" and "+ (pageSize * pageIndex) +" order by \"tousseName\" "; }else{ - sql = "select * from ( select rownum as rowno,temp2.* from (" + sql + " ) temp2 where rownum <="+ (pageSize * pageIndex + 1) +" ) temp3 where temp3.rowno>" + (pageSize * (pageIndex - 1) + 1); + sql = "select * from ( select rownum as rowno,temp2.* from (" + sql + " ) temp2 where rownum <="+ (pageSize * pageIndex) +" ) temp3 where temp3.rowno>" + (pageSize * (pageIndex - 1)); } //logger.debug("[getWashDisinfectionSumInfo]:" + sql); return getSumInfoOnlyTousseNameAndAmount(sql); @@ -412,7 +412,7 @@ if(isSqlServer){ sql = "select * from ( " + sql + " ) temp2 where rowNo between "+ (pageSize * (pageIndex - 1) + 1) +" and "+ (pageSize * pageIndex) +" order by tousseName "; }else{ - sql = "select * from ( select rownum as rowno,temp2.* from (" + sql + " ) temp2 where rownum <="+ (pageSize * pageIndex + 1) +" ) temp3 where temp3.rowno>" + (pageSize * (pageIndex - 1) + 1); + sql = "select * from ( select rownum as rowno,temp2.* from (" + sql + " ) temp2 where rownum <="+ (pageSize * pageIndex) +" ) temp3 where temp3.rowno>" + (pageSize * (pageIndex - 1)); } //logger.debug("[getPackingSumInfo]:" + sql); return getSumInfoOnlyTousseNameAndAmount(sql); @@ -480,7 +480,7 @@ if(isSqlServer){ sql = "select * from ( " + sql + " ) temp2 where rowNo between "+ (pageSize * (pageIndex - 1) + 1) +" and "+ (pageSize * pageIndex) +" order by tousseName "; }else{ - sql = "select * from ( select rownum as rowno,temp2.* from (" + sql + " ) temp2 where rownum <="+ (pageSize * pageIndex + 1) +" ) temp3 where temp3.rowno>" + (pageSize * (pageIndex - 1) + 1); + sql = "select * from ( select rownum as rowno,temp2.* from (" + sql + " ) temp2 where rownum <="+ (pageSize * pageIndex) +" ) temp3 where temp3.rowno>" + (pageSize * (pageIndex - 1)); } //logger.debug("[getReviewSumInfo]:" + sql); return getSumInfoOnlyTousseNameAndAmount(sql); @@ -548,7 +548,7 @@ if(isSqlServer){ sql = "select * from ( " + sql + " ) temp2 where rowNo between "+ (pageSize * (pageIndex - 1) + 1) +" and "+ (pageSize * pageIndex) +" order by \"tousseName\" "; }else{ - sql = "select * from ( select rownum as rowno,temp2.* from (" + sql + " ) temp2 where rownum <="+ (pageSize * pageIndex + 1) +" ) temp3 where temp3.rowno>" + (pageSize * (pageIndex - 1) + 1); + sql = "select * from ( select rownum as rowno,temp2.* from (" + sql + " ) temp2 where rownum <="+ (pageSize * pageIndex) +" ) temp3 where temp3.rowno>" + (pageSize * (pageIndex - 1)); } //logger.debug("[SterilizationSumInfoSql]:" + sql); return getSumInfoOnlyTousseNameAndAmount(sql); @@ -628,7 +628,7 @@ if(isSqlServer){ sql = "select * from ( " + sql + " ) temp2 where rowNo between "+ (pageSize * (pageIndex - 1) + 1) +" and "+ (pageSize * pageIndex) +" order by tousseName "; }else{ - sql = "select * from ( select rownum as rowno,temp2.* from (" + sql + " ) temp2 where rownum <="+ (pageSize * pageIndex + 1) +" ) temp3 where temp3.rowno>" + (pageSize * (pageIndex - 1) + 1); + sql = "select * from ( select rownum as rowno,temp2.* from (" + sql + " ) temp2 where rownum <="+ (pageSize * pageIndex) +" ) temp3 where temp3.rowno>" + (pageSize * (pageIndex - 1)); } //logger.debug("[getInvoicePlanSumInfo]:" + sql); return getSumInfoOnlyTousseNameAndAmount(sql);