Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r37517 -r37582 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 37517) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 37582) @@ -2378,7 +2378,7 @@ if(isSqlServer){ rowIdSql = " ROW_NUMBER() OVER(order by "+ (orderByWashTime?"DATEDIFF(MINUTE,washTime , getDate()) desc,":"") +"max(ui.expectUseTime) desc, max(ul.grade) desc, case when po.taskType=1 then 1 else 0 end desc, td.name desc) AS rowNo,"; }else{ - oracleOrderBysql = " order by "+ (orderByWashTime?"DATEDIFF(MINUTE,washTime , getDate()) desc,":"") +"max(ui.expectUseTime) desc, max(ul.grade) desc, case when po.taskType=1 then 1 else 0 end desc, td.name desc "; + oracleOrderBysql = " order by "+ (orderByWashTime?" washTime desc,":"") +"max(ui.expectUseTime) desc, max(ul.grade) desc, case when po.taskType=1 then 1 else 0 end desc, td.name desc "; } String sql = String.format("select " + rowIdSql + "td.name,case when po.taskType="+ PackingTask.TASK_RECYCLINGRECORD +" then 1 else 0 end type from %s po " + " join TousseDefinition td on td.id=po.tousseDefinition_id "