From 9c2856e35813abec515a78b7eaab898aa1f52656 Mon Sep 17 00:00:00 2001
From: Sola <loli@sola.love>
Date: Sun, 27 Dec 2015 00:55:07 +0800
Subject: [PATCH] add function to query all unsolved

---
 src/main/java/love/sola/netsupport/sql/TableTicket.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/love/sola/netsupport/sql/TableTicket.java b/src/main/java/love/sola/netsupport/sql/TableTicket.java
index 428f700..5e6f1c0 100644
--- a/src/main/java/love/sola/netsupport/sql/TableTicket.java
+++ b/src/main/java/love/sola/netsupport/sql/TableTicket.java
@@ -63,8 +63,10 @@ public class TableTicket extends SQLCore {
 
 	@SuppressWarnings("unchecked")
 	public static List<Ticket> unsolvedByBlock(int b) {
+		if (b == 0) return unsolved();
 		try (Session s = SQLCore.sf.openSession()) {
 			return s.createCriteria(Ticket.class)
+					.addOrder(Order.desc(Ticket.PROPERTY_SUBMIT_TIME))
 					.add(Restrictions.ne(Ticket.PROPERTY_STATUS, Status.SOLVED))
 					.createCriteria(Ticket.PROPERTY_USER)
 					.add(Restrictions.between(User.PROPERTY_BLOCK, b * 10, (b + 1) * 10 - 1))
@@ -76,6 +78,8 @@ public class TableTicket extends SQLCore {
 	public static List<Ticket> unsolved() {
 		try (Session s = SQLCore.sf.openSession()) {
 			return s.createCriteria(Ticket.class)
+					.addOrder(Order.asc(Ticket.PROPERTY_USER + "." + User.PROPERTY_BLOCK))
+					.addOrder(Order.desc(Ticket.PROPERTY_SUBMIT_TIME))
 					.add(Restrictions.ne(Ticket.PROPERTY_STATUS, Status.SOLVED))
 					.createCriteria(Ticket.PROPERTY_USER)
 					.list();