评价修改

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

@@ -30,7 +30,9 @@ public class bookCommentAction extends BaseController implements ServletRequestA
     public String commentEndTime;//结束时间
 
     public String checkoutStartTime;//退房起始时间
-    public String checkoutEndTime;//退房起始时间
+    public String checkoutEndTime;//退房结束时间
+
+    public String managerId;//商家id
 
     @Resource(name = "BookingCommentService")
     private BookingCommentService bookingCommentService;
@@ -39,11 +41,19 @@ public class bookCommentAction extends BaseController implements ServletRequestA
         JSONObject resultJson = new JSONObject();
         StringBuilder s1 = new StringBuilder("");
         StringBuilder s2 = new StringBuilder("");
+        if (managerId != null){
+            s1.append(" and b.hotel_manager_id = ").append(managerId).append(" ");
+            s2.append(" and a.hotel_manager_id = ").append(managerId).append(" ");
+        }else {
+            resultJson.put("message", "查询失败！商户id不能为空！");
+            resultJson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+        }
         if (keywords != null){
-            s1.append(" and (a.id like '%").append(keywords).append("%'");
+            s1.append(" and (a.booking_id like '%").append(keywords).append("%'");
 //            s1.append(" or a.comment_name like '%").append(keywords).append("%'");
             s1.append(" or c.user_name like '%").append(keywords).append("%')");
-            s2.append(" and (a.id like '%").append(keywords).append("%'");
+            s2.append(" and (a.booking_id like '%").append(keywords).append("%'");
             s2.append(" or a.createName like '%").append(keywords).append("%')");
         }
         if (score != null){

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

@@ -34,7 +34,7 @@ public class BookingCommentImplDao implements BookingCommentDao {
 
     private String selectSql = "select " +
             "a.id,a.comment_id,a.comment_parent_id,a.comment_name,a.booking_id,a.hotel_id,a.house_id,a.content,a.comment_status,a.score,a.score_ws," +
-            "a.score_fw,a.score_ss,a.score_wz,a.create_id,a.create_username,a.create_date,a.modify_date,a.status,b.check_out_time,c.user_name as createName" +
+            "a.score_fw,a.score_ss,a.score_wz,a.create_id,a.create_username,a.create_date,a.modify_date,a.status,b.check_out_time,c.user_name as createName,b.hotel_manager_id" +
             " from booking_comment a" +
             " left join booking b on b.id = a.booking_id" +
             " left join users c on c.id = a.create_id" +