修改bug

mhotel/src/com/happy/Model/AdminManager.java

@@ -100,7 +100,7 @@ public class AdminManager {
 	/**
 	 * 备注
 	 */
-	private String remake;
+	private String remark;
 
 	/**
 	 * 营业执照
@@ -243,12 +243,12 @@ public class AdminManager {
 		this.status = status;
 	}
 
-	public String getRemake() {
-		return remake;
+	public String getRemark() {
+		return remark;
 	}
 
-	public void setRemake(String remake) {
-		this.remake = remake;
+	public void setRemark(String remark) {
+		this.remark = remark;
 	}
 
 	public List<File> getFileList() {

mhotel/src/com/happy/action/adminManagerAction.java

@@ -90,7 +90,7 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
             }else{
                 //是否主账号首次登录
                 Hotel hotel = hotelService.getOen("and manager_id = '"+login.getId()+"'");
-                if(hotel==null && hotel.getManagerId().equals(login.getId())){
+                if(hotel==null && "2".equals(login.getLevel())){
                     resultJson.put("isLogin",1);
                 }else{
                     resultJson.put("isLogin",0);

mhotel/src/com/happy/action/bookAction.java

@@ -169,6 +169,12 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
 
         List<Booking> list = bookService.queryList(s1.toString()); // 查询分页
         List<Vector> vectorsList = new ArrayList<>();
+        if(list==null){
+            resultJson.put("code", 500);
+            resultJson.put("message", "无数据无法导出");
+            ResponseUtil.writeJson(ServletActionContext.getResponse(),
+                    resultJson.toString());
+        }
         for(Booking book:list){
             Vector columnValue = new Vector();
             columnValue.add(book.getOrderNum());
@@ -179,6 +185,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
             columnValue.add(book.getHouseOrderNumber());
             columnValue.add(book.getHouseTotalPrice());
             columnValue.add(book.getPayTime());
+            vectorsList.add(columnValue);
         }
         // 项目路径地址
         String path = request.getSession().getServletContext()
@@ -193,11 +200,13 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
             columnName.add("房间数");
             columnName.add("订单金额（元）");
             columnName.add("支付时间");
+
+            String filePathName ="订单信息" + UUIDUtil.generateID() +"Report.xls";
             // 导出文件
-            new toExcel().book(vectorsList, path + "订单信息" + UUIDUtil.generateID() +"Report.xls",
+            new toExcel().book(vectorsList, path + filePathName,
                     "sheet1", columnName);
-            String url = request.getSession().getServletContext().getContextPath();
-            resultJson.put("downurl", url+"/download/订单信息" + "Report.xls");
+            String url = request.getServerName()+":"+request.getServerPort() + request.getSession().getServletContext().getContextPath();
+            resultJson.put("downurl", url + "/download/" + filePathName);
             resultJson.put("code", 200);
             resultJson.put("message", "导出成功");
             ResponseUtil.writeJson(ServletActionContext.getResponse(),
@@ -317,6 +326,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
             columnValue.add(book.getHouseOrderNumber());
             columnValue.add(book.getPayAccount());
             columnValue.add(book.getPayTime());
+            vectorsList.add(columnValue);
         }
         // 项目路径地址
         String path = request.getSession().getServletContext()
@@ -330,11 +340,13 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
             columnName.add("房间数");
             columnName.add("订单金额");
             columnName.add("退房时间");
+
+            String filePathName ="台账信息" + UUIDUtil.generateID() +"Report.xls";
             // 导出文件
-            new toExcel().book(vectorsList, path + "台账信息" + UUIDUtil.generateID() + "Report.xls",
+            new toExcel().book(vectorsList, path + filePathName,
                     "sheet1", columnName);
-            String url = request.getSession().getServletContext().getContextPath();
-            resultJson.put("downurl", url+"/download/台账信息" + "Report.xls");
+            String url = request.getServerName()+":"+request.getServerPort() + request.getSession().getServletContext().getContextPath();
+            resultJson.put("downurl", url + "/download/" + filePathName);
             resultJson.put("code", 200);
             resultJson.put("message", "导出成功");
             ResponseUtil.writeJson(ServletActionContext.getResponse(),

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

@@ -30,7 +30,7 @@ public class AdminManagerImplDao implements AdminManagerDao {
     @Override
     public int insertAdmin(AdminManager adminManager) {
 
-        String sql = "INSERT INTO admin_manager (id, manager_id, admin_name, password, hotel_name, hotel_township, corpn_name, corpn_phone, level, admin_power, bank_card, card_name, bank_name, create_id, create_date, status, remake) VALUES (:id, :admin_name, :password, :hotel_name, :hotel_township, :corpn_name, :corpn_phone, :level, :admin_power, :bank_card, :card_name, :bank_name, :create_id, :create_date, :status, :remake)";
+        String sql = "INSERT INTO admin_manager (id, manager_id, admin_name, password, hotel_name, hotel_township, corpn_name, corpn_phone, level, admin_power, bank_card, card_name, bank_name, create_id, create_date, status, remark) VALUES (:id, :admin_name, :password, :hotel_name, :hotel_township, :corpn_name, :corpn_phone, :level, :admin_power, :bank_card, :card_name, :bank_name, :create_id, :create_date, :status, :remark)";
 
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("manager_id", adminManager.getAdminName());
@@ -48,7 +48,7 @@ public class AdminManagerImplDao implements AdminManagerDao {
         sps.addValue("create_id", adminManager.getCreateId());
         sps.addValue("create_date",adminManager.getCreateDate());
         sps.addValue("status", 1);
-        sps.addValue("remake", adminManager.getRemake());
+        sps.addValue("remark", adminManager.getRemark());
         if(adminManager.getId()==null){
             sps.addValue("id", UUIDUtil.generateID());
         }else{
@@ -67,7 +67,7 @@ public class AdminManagerImplDao implements AdminManagerDao {
     @Override
     public int updateAdmin(AdminManager adminManager) {
 
-        String sql = "UPDATE admin_manager SET admin_name = :admin_name, password = :password, hotel_name = :hotel_name, hotel_township = :hotel_township, corpn_name = :corpn_name, corpn_phone = :corpn_phone, level = :level, admin_power = :admin_power, bank_card = :bank_card, card_name = :card_name, bank_name = :bank_name, create_id = :create_id, modify_date =:modify_date, status =:status, remake =:remake WHERE id = :id";
+        String sql = "UPDATE admin_manager SET admin_name = :admin_name, password = :password, hotel_name = :hotel_name, hotel_township = :hotel_township, corpn_name = :corpn_name, corpn_phone = :corpn_phone, level = :level, admin_power = :admin_power, bank_card = :bank_card, card_name = :card_name, bank_name = :bank_name, create_id = :create_id, modify_date =:modify_date, status =:status, remark =:remark WHERE id = :id";
 
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("admin_name", adminManager.getAdminName());
@@ -84,7 +84,7 @@ public class AdminManagerImplDao implements AdminManagerDao {
         sps.addValue("create_id", adminManager.getCreateId());
         sps.addValue("modify_date",adminManager.getModifyDate());
         sps.addValue("status", adminManager.getStatus());
-        sps.addValue("remake", adminManager.getRemake());
+        sps.addValue("remark", adminManager.getRemark());
         sps.addValue("id",adminManager.getId());
         int num = 0;
         try{