Browse Source

投诉排序

夏文涛 2 years ago
parent
commit
4379a6eab7

+ 2 - 1
mhotel/src/com/happy/action/bookComplainAction.java

@@ -14,6 +14,7 @@ import com.happy.service.BookingComplaintService;
 import com.happy.service.HotelCoupomStatusService;
 import com.happy.service.HotelCoupomStatusService;
 import com.happy.service.HotelService;
 import com.happy.service.HotelService;
 import com.happy.service.HouseService;
 import com.happy.service.HouseService;
+import com.happy.vo.BookingComplaintVo;
 import net.sf.json.JSONObject;
 import net.sf.json.JSONObject;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.interceptor.ServletRequestAware;
 import org.apache.struts2.interceptor.ServletRequestAware;
@@ -65,7 +66,7 @@ public class bookComplainAction extends BaseController implements ServletRequest
             s1.append(" and DATE_FORMAT(a.create_date, '%Y-%m-%d') <= '").append(complainEndTime).append("' ");
             s1.append(" and DATE_FORMAT(a.create_date, '%Y-%m-%d') <= '").append(complainEndTime).append("' ");
             s2.append(" and DATE_FORMAT(create_date, '%Y-%m-%d') <= '").append(complainEndTime).append("' ");
             s2.append(" and DATE_FORMAT(create_date, '%Y-%m-%d') <= '").append(complainEndTime).append("' ");
         }
         }
-        IPage<BookingComplaint> bookingComplaintIPage = bookingComplaintService.queryPage(s1.toString(),s2.toString(), page, rows);
+        IPage<BookingComplaintVo> bookingComplaintIPage = bookingComplaintService.queryPage(s1.toString(),s2.toString(), page, rows);
         if(bookingComplaintIPage!=null && !"".equals(bookingComplaintIPage)){
         if(bookingComplaintIPage!=null && !"".equals(bookingComplaintIPage)){
             resultJson.put("message", "查询分页成功");
             resultJson.put("message", "查询分页成功");
             resultJson.put("code", 200);
             resultJson.put("code", 200);

+ 2 - 1
mhotel/src/com/happy/dao/BookingComplainDao.java

@@ -3,6 +3,7 @@ package com.happy.dao;
 import com.happy.Model.BookingComplaint;
 import com.happy.Model.BookingComplaint;
 import com.happy.Model.HotelCoupon;
 import com.happy.Model.HotelCoupon;
 import com.happy.dto.IPage;
 import com.happy.dto.IPage;
+import com.happy.vo.BookingComplaintVo;
 import com.happy.vo.ComplaintPageVo;
 import com.happy.vo.ComplaintPageVo;
 import com.happy.vo.DetailsVo;
 import com.happy.vo.DetailsVo;
 import com.happy.vo.ProgressDetailsVo;
 import com.happy.vo.ProgressDetailsVo;
@@ -11,7 +12,7 @@ import java.util.List;
 
 
 public interface BookingComplainDao {
 public interface BookingComplainDao {
 
 
-    List<BookingComplaint> queryPage(String sqlx, int page, int rows);
+    List<BookingComplaintVo> queryPage(String sqlx, int page, int rows);
     List<BookingComplaint> toComplainExcel(String sqlx);
     List<BookingComplaint> toComplainExcel(String sqlx);
 
 
     int queryTotal(String sqlx);
     int queryTotal(String sqlx);

+ 15 - 4
mhotel/src/com/happy/dao/impl/BookingComplainImplDao.java

@@ -8,6 +8,7 @@ import com.happy.Until.SqlUtil;
 import com.happy.Until.UUIDUtil;
 import com.happy.Until.UUIDUtil;
 import com.happy.dao.BookingComplainDao;
 import com.happy.dao.BookingComplainDao;
 import com.happy.dto.IPage;
 import com.happy.dto.IPage;
+import com.happy.vo.BookingComplaintVo;
 import com.happy.vo.ComplaintPageVo;
 import com.happy.vo.ComplaintPageVo;
 import com.happy.vo.DetailsVo;
 import com.happy.vo.DetailsVo;
 import com.happy.vo.ProgressDetailsVo;
 import com.happy.vo.ProgressDetailsVo;
@@ -42,16 +43,26 @@ public class BookingComplainImplDao implements BookingComplainDao {
             " left join users u on a.create_id = u.id " +
             " left join users u on a.create_id = u.id " +
             " where a.status != 0 ";
             " where a.status != 0 ";
 
 
+    private String selectLeftSql = "select " +
+            " bk.order_num,u.user_phone as complainPhone,m.corpn_phone as hotelPhone,a.id,a.booking_id,a.hotel_id,a.house_id,a.title,a.content,a.create_id,a.create_date,a.modify_date,a.status,h.h_name as house_name,h2.hname as hotel_name" +
+            " from booking_complaint a " +
+            " left join house h on a.house_id = h.id " +
+            " left join hotel h2 on a.hotel_id = h2.id "+
+            " left join booking bk on a.booking_id = bk.id"+
+            " left join admin_manager m on h2.manager_id = m.id " +
+            " left join users u on a.create_id = u.id " +
+            " where a.status != 0 ";
+
     @Override
     @Override
-    public List<BookingComplaint> queryPage(String sqlx, int page, int rows) {
+    public List<BookingComplaintVo> queryPage(String sqlx, int page, int rows) {
         SqlUtil.filterKeyword(sqlx);
         SqlUtil.filterKeyword(sqlx);
         int start = (page - 1) * rows;// 每页的起始下标
         int start = (page - 1) * rows;// 每页的起始下标
-        String sql = selectSql + sqlx + "and a.status != 0"  +" ORDER BY id DESC limit :start,:rows ";
+        String sql = selectLeftSql + sqlx + "and a.status != 0"  +" ORDER BY createDate DESC limit :start,:rows ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("start", start);
         sps.addValue("start", start);
         sps.addValue("rows", rows);
         sps.addValue("rows", rows);
-        List<BookingComplaint> list = namedParameterJdbcTemplate.query(sql, sps,
-                new BeanPropertyRowMapper<>(BookingComplaint.class));
+        List<BookingComplaintVo> list = namedParameterJdbcTemplate.query(sql, sps,
+                new BeanPropertyRowMapper<>(BookingComplaintVo.class));
         if (list != null && list.size() > 0) return list;
         if (list != null && list.size() > 0) return list;
         return null;
         return null;
     }
     }

+ 1 - 4
mhotel/src/com/happy/service/BookingCommentService.java

@@ -3,13 +3,10 @@ package com.happy.service;
 import com.happy.Model.BookingComment;
 import com.happy.Model.BookingComment;
 import com.happy.Model.FileInfo;
 import com.happy.Model.FileInfo;
 import com.happy.dto.IPage;
 import com.happy.dto.IPage;
-import com.happy.vo.CommentDetailsVo;
-import com.happy.vo.CommentVo;
-import com.happy.vo.EvaluatePageVo;
+import com.happy.vo.*;
 import com.happy.Model.HotelCoupon;
 import com.happy.Model.HotelCoupon;
 import com.happy.dto.BookCommentDto;
 import com.happy.dto.BookCommentDto;
 import com.happy.dto.IPage;
 import com.happy.dto.IPage;
-import com.happy.vo.PersonageDetailsVo;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 2 - 1
mhotel/src/com/happy/service/BookingComplaintService.java

@@ -3,6 +3,7 @@ package com.happy.service;
 import com.happy.Model.BookingComplaint;
 import com.happy.Model.BookingComplaint;
 import com.happy.Model.HotelCoupon;
 import com.happy.Model.HotelCoupon;
 import com.happy.dto.IPage;
 import com.happy.dto.IPage;
+import com.happy.vo.BookingComplaintVo;
 import com.happy.vo.ComplaintPageVo;
 import com.happy.vo.ComplaintPageVo;
 import com.happy.vo.ProgressDetailsVo;
 import com.happy.vo.ProgressDetailsVo;
 
 
@@ -16,7 +17,7 @@ public interface BookingComplaintService {
      * @param rows
      * @param rows
      * @return
      * @return
      */
      */
-    IPage<BookingComplaint> queryPage(String sqlx,String sql, int page, int rows);
+    IPage<BookingComplaintVo> queryPage(String sqlx, String sql, int page, int rows);
 
 
     /**
     /**
      * 描述:获取总条数
      * 描述:获取总条数

+ 5 - 8
mhotel/src/com/happy/service/impl/BookingComplaintImplService.java

@@ -13,10 +13,7 @@ import com.happy.dto.IPage;
 import com.happy.service.BookingComplaintProgressService;
 import com.happy.service.BookingComplaintProgressService;
 import com.happy.service.BookingComplaintService;
 import com.happy.service.BookingComplaintService;
 import com.happy.service.FileService;
 import com.happy.service.FileService;
-import com.happy.vo.ComplaintPageVo;
-import com.happy.vo.DetailsVo;
-import com.happy.vo.PersonageCommentVo;
-import com.happy.vo.ProgressDetailsVo;
+import com.happy.vo.*;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
@@ -38,9 +35,9 @@ public class BookingComplaintImplService implements BookingComplaintService {
     public BookingComplaintProgressService bookingComplaintProgressService;
     public BookingComplaintProgressService bookingComplaintProgressService;
 
 
     @Override
     @Override
-    public IPage<BookingComplaint> queryPage(String sqlx,String sql, int page, int rows) {
-        IPage<BookingComplaint> iPage = new IPage();
-        List<BookingComplaint> houseList =  bookingComplainDao.queryPage(sqlx,page,rows);
+    public IPage<BookingComplaintVo> queryPage(String sqlx, String sql, int page, int rows) {
+        IPage<BookingComplaintVo> iPage = new IPage();
+        List<BookingComplaintVo> houseList =  bookingComplainDao.queryPage(sqlx,page,rows);
         int total = bookingComplainDao.queryTotal(sql);
         int total = bookingComplainDao.queryTotal(sql);
         iPage.setPageList(houseList);
         iPage.setPageList(houseList);
         iPage.setPage(page);
         iPage.setPage(page);
@@ -200,5 +197,5 @@ public class BookingComplaintImplService implements BookingComplaintService {
     }
     }
 
 
 
 
-	
+
 }
 }

+ 42 - 0
mhotel/src/com/happy/vo/BookingComplaintVo.java

@@ -0,0 +1,42 @@
+package com.happy.vo;
+
+import com.happy.Model.FileInfo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BookingComplaintVo {
+
+    private String id; //主键
+
+    private String bookingId;//投诉订单id
+
+    private String hotelId;//投诉民宿id
+
+    private String houseId;//投诉房型id
+
+    private String title;//投诉标题
+
+    private String content;//内容
+
+    private String createId;//创建人
+
+    private String createDate;//创建时间
+
+    private String modifyDate;//修改时间
+
+    private String status;//状态(0删除 1.处理中 2.已处理)
+
+    private String houseName; //房型名称
+
+    private String hotelName; //酒店名称名称
+
+    private String complainPhone; // 投诉人电话
+
+    private String hotelPhone; //酒店电话
+
+    private String order_num;//订单号
+
+    List<FileInfo> fileInfos;// 附件
+}