diff --git a/src/main/java/uk/ac/ncl/dwa/database/SpecificQueriesHelper.java b/src/main/java/uk/ac/ncl/dwa/database/SpecificQueriesHelper.java index 2a8d407..a0f99d6 100644 --- a/src/main/java/uk/ac/ncl/dwa/database/SpecificQueriesHelper.java +++ b/src/main/java/uk/ac/ncl/dwa/database/SpecificQueriesHelper.java @@ -84,8 +84,8 @@ public static String getPersonHelperStatus(String person_id, String start_date, } public static String getAllStatus(String table, String start_date, String end_date) { - String[] columnNames = new String[]{"count", "firstname", "lastname"}; - String sql = "select count(*) as count, p.firstname as firstname, p.lastname as lastname from " + String[] columnNames = new String[]{"count", "firstname", "lastname", "email"}; + String sql = "select count(*) as count, p.firstname as firstname, p.lastname as lastname, p.email from " + table + " as i " + "join people as p on i.person_id = p.person_id where i.slug > \"" + start_date + "\" group by i.person_id order by p.firstname"; logger.info(sql); @@ -93,7 +93,8 @@ public static String getAllStatus(String table, String start_date, String end_da StringBuilder sb = new StringBuilder(); counts.forEach(record -> { HashMap r = (HashMap) record; - sb.append(r.get("count") + "\t" + r.get("firstname") + "\t" + r.get("lastname") + "\n"); + sb.append(r.get("count") + "\t" + r.get("firstname") + "\t" + r.get("lastname") + "\t" + r.get("email") + + "\n"); }); return sb.toString();