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

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

@@ -588,6 +588,7 @@ public class AppBookingCommentAction extends ActionSupport implements ServletReq
         for (PersonageCommentVo personageCommentVo : pageList) {
             String bookingCommentId1 = personageCommentVo.getBookingCommentId();
             CommentDetailsVo commentDetailsVo =bookingCommentService.commentDetails(bookingCommentId1);
+            commentDetailsVo.setVo(personageCommentVo);
             commentDetailsVos.add(commentDetailsVo);
         }
 

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

@@ -739,13 +739,13 @@ public class BookingCommentImplDao implements BookingCommentDao {
                 "\tb.house_name AS houseName,\n" +
                 "\tb.live_time AS liveTime,\n" +
                 "\tb.check_out_time AS checkOutTime,\n" +
-                "\tb.pay_account AS payAccount ,fi.url as url\n" +
+                "\tb.pay_account AS payAccount ,fi.url as url,w.workflow_remark as remark\n" +
                 "FROM\n" +
                 "\t`booking` b\n" +
                 "\tINNER JOIN booking_comment bc ON b.id = bc.booking_id \n" +
                 "\tAND bc.comment_parent_id IS NULL \n" +
                 "\tAND bc.`status` = 3\n" +
-                "\tLEFT JOIN users u ON u.id = b.create_userid  LEFT JOIN file_info fi on fi.link_id=b.house_id \n" +
+                "\tLEFT JOIN users u ON u.id = b.create_userid  LEFT JOIN file_info fi on fi.link_id=b.house_id LEFT JOIN workflow w ON bc.id=w.link_id \n" +
                 "WHERE\n" +
                 "\tu.id = :usersId \n" +
                 "\tAND b.order_status = 5 \n" +
@@ -770,7 +770,7 @@ public class BookingCommentImplDao implements BookingCommentDao {
                 "\tINNER JOIN booking_comment bc ON b.id = bc.booking_id \n" +
                 "\tAND bc.comment_parent_id IS NULL \n" +
                 "\tAND bc.`status` = 3\n" +
-                "\tLEFT JOIN users u ON u.id = b.create_userid LEFT JOIN file_info fi on fi.link_id=b.house_id \n" +
+                "\tLEFT JOIN users u ON u.id = b.create_userid LEFT JOIN file_info fi on fi.link_id=b.house_id LEFT JOIN workflow w ON bc.id=w.link_id \n" +
                 "WHERE\n" +
                 "\tu.id = :usersId \n" +
                 "\tAND b.order_status = 5 \n" +

mhotel/src/com/happy/vo/CommentDetailsVo.java

@@ -1,7 +1,9 @@
 package com.happy.vo;
 
-import java.util.List;
+import lombok.Data;
 
+import java.util.List;
+@Data
 public class CommentDetailsVo {
     //    id
     private String id;
@@ -51,6 +53,8 @@ public class CommentDetailsVo {
 //    酒店id
     private String hotelId;
 
+    private PersonageCommentVo vo;
+
     public String getHotelId() {
         return hotelId;
     }

mhotel/src/com/happy/vo/PersonageCommentVo.java

@@ -1,5 +1,8 @@
 package com.happy.vo;
 
+import lombok.Data;
+
+@Data
 public class PersonageCommentVo {
 //    数据ID
     private String id;
@@ -31,6 +34,9 @@ public class PersonageCommentVo {
 //    房间id
     private String houseId;
 
+//    审批备注
+    private String remark;
+
     public String getHotelId() {
         return hotelId;
     }