|
@@ -16,6 +16,7 @@ import com.opensymphony.xwork2.ActionSupport;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import org.apache.struts2.ServletActionContext;
|
|
import org.apache.struts2.ServletActionContext;
|
|
|
import org.apache.struts2.interceptor.ServletRequestAware;
|
|
import org.apache.struts2.interceptor.ServletRequestAware;
|
|
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
@@ -566,13 +567,27 @@ public class AppBookingCommentAction extends ActionSupport implements ServletReq
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
- IPage ipage=bookingCommentService.personageComment(status, usersId, page, rows);
|
|
|
|
|
|
|
+ IPage<PersonageCommentVo> ipage=bookingCommentService.personageComment(status, usersId, page, rows);
|
|
|
|
|
+
|
|
|
|
|
+ IPage<CommentDetailsVo> voIPage = new IPage<>();
|
|
|
|
|
+ BeanUtils.copyProperties(ipage,voIPage);
|
|
|
|
|
+
|
|
|
|
|
+ List<PersonageCommentVo> pageList = ipage.getPageList();
|
|
|
|
|
+ ArrayList<CommentDetailsVo> commentDetailsVos = new ArrayList<>();
|
|
|
|
|
+ for (PersonageCommentVo personageCommentVo : pageList) {
|
|
|
|
|
+ String bookingCommentId1 = personageCommentVo.getBookingCommentId();
|
|
|
|
|
+ CommentDetailsVo commentDetailsVo =bookingCommentService.commentDetails(bookingCommentId1);
|
|
|
|
|
+ commentDetailsVos.add(commentDetailsVo);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ voIPage.setPageList(commentDetailsVos);
|
|
|
|
|
+
|
|
|
PersonageCommentCountVo vo=bookingCommentService.personageCommentCount(usersId);
|
|
PersonageCommentCountVo vo=bookingCommentService.personageCommentCount(usersId);
|
|
|
|
|
|
|
|
jsonObject.put("code", 200);
|
|
jsonObject.put("code", 200);
|
|
|
jsonObject.put("message", "成功");
|
|
jsonObject.put("message", "成功");
|
|
|
jsonObject.put("success", true);
|
|
jsonObject.put("success", true);
|
|
|
- jsonObject.put("page", ipage);
|
|
|
|
|
|
|
+ jsonObject.put("page", voIPage);
|
|
|
jsonObject.put("data", vo);
|
|
jsonObject.put("data", vo);
|
|
|
ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
|
|
ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
|
|
|
|
|
|