Merge branch 'master' of https://e.coding.net/chuanghaikeji/jinganxiangsu/Homestay_app_houtai

mhotel/src/com/happy/dao/impl/BookingComplainImplDao.java

@@ -104,7 +104,11 @@ public class BookingComplainImplDao implements BookingComplainDao {
         sps.addValue("create_date",createDate);
         sps.addValue("modify_date",modifyDate);
         sps.addValue("status",1);
-        String id ="TS"+ UUIDUtil.getNewDate();
+        String id = UUIDUtil.getNewDate();
+        id = id.replaceAll(" ","");
+        id = id.replaceAll("-","");
+        id = id.replaceAll(":","");
+        id="TS"+id.substring(2,id.length());
         sps.addValue("id", id);
 
         int num = 0;
@@ -139,7 +143,7 @@ public class BookingComplainImplDao implements BookingComplainDao {
                 "\t( SELECT bcp.progress_type FROM booking_complaint_progress bcp WHERE bcp.complaint_id = bc.id ORDER BY bcp.create_date DESC LIMIT 1 ) AS progressType \n" +
                 "FROM\n" +
                 "\t`booking_complaint` bc\n" +
-                "\tLEFT JOIN booking b ON b.id = bc.booking_id AND b.status_del=1  LEFT JOIN file_info fi on bc.house_id=fi.link_id  where bc.create_id=:usersId ORDER BY bc.create_date DESC limit :start,:rows )bc2 ORDER BY bc2.progressType asc ";
+                "\tLEFT JOIN booking b ON b.id = bc.booking_id AND b.status_del=1  LEFT JOIN file_info fi on bc.house_id=fi.link_id  where bc.create_id=:usersId  DESC limit :start,:rows )bc2 ORDER BY bc2.progressType asc ,bc2.dateTime DESC ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("start", start);
         sps.addValue("rows", rows);