Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r38937 -r38958 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 38937) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 38958) @@ -2505,9 +2505,9 @@ boolean isSqlServer = dbConnection.isSqlServer(); String oracleOrderBysql = ""; if(isSqlServer || dbConnection.isMySQLOrTiDB()){ - rowIdSql = " ROW_NUMBER() OVER(order by "+ (orderByWashTime?"max(washTime) desc,":"") +"max(t.expectUseTime) desc, max(t.grade) desc, t.taskType desc, t.name desc) AS rowNo,"; + rowIdSql = " ROW_NUMBER() OVER(order by "+ (orderByWashTime?"max(t.washTime) desc,":"") +"max(t.expectUseTime) desc, max(t.grade) desc, t.taskType desc, t.name desc) AS rowNo,"; }else{ - oracleOrderBysql = " order by "+ (orderByWashTime?" max(washTime) desc,":"") +"max(t.expectUseTime) desc, max(t.grade) desc, t.taskType desc, t.name desc "; + oracleOrderBysql = " order by "+ (orderByWashTime?" max(t.washTime) desc,":"") +"max(t.expectUseTime) desc, max(t.grade) desc, t.taskType desc, t.name desc "; } String sql = String.format("select " + rowIdSql + "t.name,t.taskType,max(t.washTime) washTime from (select td.name,case when po.taskType="+ PackingTask.TASK_RECYCLINGRECORD +" then 1 else 0 end taskType,ui.expectUseTime,ul.grade,po.washTime from %s po " + " join TousseDefinition td on td.id=po.tousseDefinition_id "