Merge remote-tracking branch 'origin/master'

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

@@ -54,7 +54,7 @@ public class AdminManagerImplDao implements AdminManagerDao {
         sps.addValue("card_name", adminManager.getCardName());
         sps.addValue("bank_name", adminManager.getBankName());
         sps.addValue("create_id", adminManager.getCreateId());
-        sps.addValue("create_date",adminManager.getCreateDate());
+        sps.addValue("create_date",UUIDUtil.getNewDate());
         sps.addValue("status", 1);
         sps.addValue("remark", adminManager.getRemark());
         if(adminManager.getId()==null){

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

@@ -90,7 +90,7 @@ public class IDCImplDao implements IDCDao {
                 "\t(select count(1) bookNumyDay from booking where order_status = 2 and DATE_FORMAT(pay_time,'%Y-%m-%d') = DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%m-%d')) b,\n" +
                 "\t(select sum(pay_account) salesAmountDay from booking where order_status = 2 and DATE_FORMAT(pay_time,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')) c,\n" +
                 "\t(select sum(pay_account) salesAmountyDay from booking where order_status = 2 and DATE_FORMAT(pay_time,'%Y-%m-%d') = DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%m-%d')) d,\n" +
-                "\t(select count(1) hotelSum from booking where order_status = 2 and DATE_FORMAT(pay_time,'%Y-%m-%d') = DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%m-%d')) e\n" +
+                "\t(select count(1) hotelSum from admin_manager where status = 1 and level=2) e\n" +
                 ")";
         List<IDCSum> list = null;
         try{