Merge branch 'master' of http://nokia.tianhaikj.tk:13000/other/hb_nokia_pm_ui

src/main/java/com/nokia/hb/utils/DbUtil.java

@@ -132,11 +132,12 @@ public class DbUtil {
         String endTime = timeArray[1];
         String sql = "select a.cellname, a.city, a.quxian, a.vendor, b.*"
                 + " from (select eci, cellname, city, quxian, vendor from pm_parse.per_cfg_cell"
-                + " where quxian in (" + quxians + ")) a"
+                + " where city in (" + citys + ") and quxian in (" + quxians + ")) a"
                 + " inner join (select " + indicators + " from pm_parse.pm_4g_" + ttype
                 + " where sdate >= '" + startTime
                 + "' and sdate <= '" + endTime + "') b"
-                + " on a.eci = b.eci";
+                + " on a.eci = b.eci"
+                + " order by b.sdate desc";
         // eci
         if ("eci".equals(searchType)) {
             condition = "'" + condition.replace(",", "','") + "'";
@@ -148,7 +149,8 @@ public class DbUtil {
                     + " inner join (select " + indicators + " from pm_parse.pm_4g_" + ttype
                     + " where sdate >= '" + startTime
                     + "' and sdate <= '" + endTime + "') b"
-                    + " on a.eci = b.eci";
+                    + " on a.eci = b.eci"
+                    + " order by b.sdate desc";
         }
 
         log.debug("sql: {}", sql);