房间数和价格

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

@@ -19,13 +19,15 @@ public class BookingComplaint {
 
     private String content;//内容
 
+    private String remark;//备注
+
     private String createId;//创建人
 
     private String createDate;//创建时间
 
     private String modifyDate;//修改时间
 
-    private String status;//状态(0删除 1.处理中 2.已处理)
+    private String status;//状态(0删除 1.待处理 2.处理中 3.处理完成)
 
     private String houseName; //房型名称
 

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

@@ -189,10 +189,14 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
                     }
 
                     Optional<HotelPriceOneDataVo> one = newOneDatas.stream().filter(e -> e.getManagerId().equals(hotel.getManagerId())).findFirst();
-                    if (one != null && one.isPresent()) {
-                        hotel.setMin_price(decimalFormat.format(one.get().getPrice()));
+                    Optional<PriceHotelDataVo> min = mins.stream().filter(e -> e.getManagerId().equals(hotel.getManagerId())).findFirst();
+                    if (one != null && one.isPresent() && min != null && min.isPresent()) {
+                        if(one.get().getPrice() > min.get().getPrice()){
+                            hotel.setMin_price(decimalFormat.format(min.get().getPrice()));
+                        }else {
+                            hotel.setMin_price(decimalFormat.format(one.get().getPrice()));
+                        }
                     } else {
-                        Optional<PriceHotelDataVo> min = mins.stream().filter(e -> e.getManagerId().equals(hotel.getManagerId())).findFirst();
                         if (min != null && min.isPresent()) {
                             hotel.setMin_price(decimalFormat.format(min.get().getPrice()));
                         }

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

@@ -248,8 +248,8 @@ public class HousePriceAction extends BaseController implements ModelDriven<Hous
          * 根据房型ID处理重复的数据
          */
         List<HousePriceOneDataVo> newOneDatas = new ArrayList<>();
-        List<Integer> houseIds = oneDatas.stream().map(HousePriceOneDataVo::getHouseId).distinct().collect(Collectors.toList());
-        for (Integer houseId : houseIds) {
+        List<String> houseIds = oneDatas.stream().map(HousePriceOneDataVo::getHouseId).distinct().collect(Collectors.toList());
+        for (String houseId : houseIds) {
             for (String str : dateStrs) {
                 Optional<HousePriceOneDataVo> one = oneDatas.stream().filter(e -> e.getSetDate().equals(str) && e.getHouseId().equals(houseId)).sorted(Comparator.comparing(HousePriceOneDataVo::getCreateDate, Comparator.reverseOrder())).findFirst();
                 if (one != null && one.isPresent()) {

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

@@ -335,10 +335,14 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
             hotelData.setType(hotel.getType());
             //价格
             Optional<HotelPriceOneDataVo> one = newOneDatas.stream().filter(e -> e.getManagerId().equals(hotel.getManagerId())).findFirst();
-            if (one != null && one.isPresent()) {
-                hotelData.setPrice(decimalFormat.format(one.get().getPrice()));
+            Optional<PriceHotelDataVo> min = mins.stream().filter(e -> e.getManagerId().equals(hotel.getManagerId())).findFirst();
+            if (one != null && one.isPresent() && min != null && min.isPresent()) {
+                if(one.get().getPrice() > min.get().getPrice()){
+                    hotelData.setPrice(decimalFormat.format(min.get().getPrice()));
+                }else{
+                    hotelData.setPrice(decimalFormat.format(one.get().getPrice()));
+                }
             } else {
-                Optional<PriceHotelDataVo> min = mins.stream().filter(e -> e.getManagerId().equals(hotel.getManagerId())).findFirst();
                 if (min != null && min.isPresent()) {
                     hotelData.setPrice(decimalFormat.format(min.get().getPrice()));
                 }
@@ -504,10 +508,14 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
             hotelData.setType(hotel.getType());
             //价格
             Optional<HotelPriceOneDataVo> one = newOneDatas.stream().filter(e -> e.getManagerId().equals(hotel.getManagerId())).findFirst();
-            if (one != null && one.isPresent()) {
-                hotelData.setPrice(decimalFormat.format(one.get().getPrice()));
+            Optional<PriceHotelDataVo> min = mins.stream().filter(e -> e.getManagerId().equals(hotel.getManagerId())).findFirst();
+            if (one != null && one.isPresent() && min != null && min.isPresent()) {
+                if(one.get().getPrice() > min.get().getPrice()){
+                    hotelData.setPrice(decimalFormat.format(min.get().getPrice()));
+                }else{
+                    hotelData.setPrice(decimalFormat.format(one.get().getPrice()));
+                }
             } else {
-                Optional<PriceHotelDataVo> min = mins.stream().filter(e -> e.getManagerId().equals(hotel.getManagerId())).findFirst();
                 if (min != null && min.isPresent()) {
                     hotelData.setPrice(decimalFormat.format(min.get().getPrice()));
                 }

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

@@ -8,13 +8,11 @@ import com.happy.Model.weixin.WeiXinUtil;
 import com.happy.Until.Excel.toExcel;
 import com.happy.Until.ResUtil;
 import com.happy.Until.ResponseUtil;
+import com.happy.Until.TimeExchange;
 import com.happy.Until.UUIDUtil;
 import com.happy.common.controller.BaseController;
 import com.happy.dto.IPage;
-import com.happy.service.BookingComplaintService;
-import com.happy.service.HotelCoupomStatusService;
-import com.happy.service.HotelService;
-import com.happy.service.HouseService;
+import com.happy.service.*;
 import com.happy.vo.BookingComplaintVo;
 import net.sf.json.JSONObject;
 import org.apache.struts2.ServletActionContext;
@@ -24,17 +22,23 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
+import java.util.logging.SimpleFormatter;
 
 public class bookComplainAction extends BaseController implements ServletRequestAware {
 
     public String keywords;//关键字搜索
 
+    public String remark;//备注
+
     public String complainStartTime;//起始时间
 
     public String complainEndTime;//结束时间
 
     @Resource(name = "BookingComplaintService")
     private BookingComplaintService bookingComplaintService;
+
+    @Resource(name = "BookingComplaintProgressService")
+    private BookingComplaintProgressService bookingComplaintProgressService;
     /**
      * 列表查询
      * @return
@@ -82,12 +86,115 @@ public class bookComplainAction extends BaseController implements ServletRequest
 
     }
 
+
+    /**
+     * 确认受理
+     * @return
+     */
+    public String acceptance(){
+        JSONObject resultJson = new JSONObject();
+        if(id == null){
+            resultJson.put("code", 500);
+            resultJson.put("message", "数据ID或备注不能为空");
+            ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+
+        BookingComplaint bookingComplaint = bookingComplaintService.getById(id);
+        if (bookingComplaint == null) {
+            resultJson.put("code", 500);
+            resultJson.put("message", "投诉数据已失效，受理失败");
+            ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+
+        int updateStatus = bookingComplaintService.updateComplain(id,"status = 2" +(remark == null ? "" : ",remark = '"+remark+"'"));
+        if(updateStatus <= 0){
+            resultJson.put("code", 500);
+            resultJson.put("message", "受理失败");
+            ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+
+        int cpInsert = bookingComplaintProgressService.insert(id,bookingComplaint.getCreateId(), TimeExchange.getTime(),TimeExchange.getTime(), "2");
+        if(cpInsert <= 0){
+            resultJson.put("code", 500);
+            resultJson.put("message", "受理失败");
+            ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+
+        resultJson.put("message", "受理成功");
+        resultJson.put("code", 200);
+        resultJson.put("data", bookingComplaint);
+        ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+        return null;
+    }
+
+
+    /**
+     * 获取备注
+     */
+    public String getRemarkById(){
+        JSONObject resultJson = new JSONObject();
+        BookingComplaint bookingComplaint = bookingComplaintService.getById(id);
+        if (bookingComplaint != null) {
+            resultJson.put("message", "查询成功");
+            resultJson.put("code", 200);
+            resultJson.put("data", bookingComplaint.getContent());
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }else{
+            resultJson.put("message", "未查询到投诉订单信息");
+            resultJson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+    }
+
+
+    /**
+     * 更新备注
+     */
+    public String updateRemarkById(){
+        JSONObject resultJson = new JSONObject();
+
+        if(id == null || remark == null){
+            resultJson.put("code", 500);
+            resultJson.put("message", "参数不能为空");
+            ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+
+        BookingComplaint bookingComplaint = bookingComplaintService.getById(id);
+        if (bookingComplaint != null) {
+            int updateStatus = bookingComplaintService.updateComplain(id,"remark = '"+remark+"'");
+            if(updateStatus <= 0){
+                resultJson.put("code", 500);
+                resultJson.put("message", "添加失败");
+                ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
+
+            resultJson.put("message", "添加成功");
+            resultJson.put("code", 200);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }else{
+            resultJson.put("message", "未查询到投诉订单信息");
+            resultJson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+    }
+
+
     /**
      * 投诉详情
      */
     public String getById(){
         JSONObject resultJson = new JSONObject();
-        BookingComplaint bookingComplaint = bookingComplaintService.getById(id);
+        BookingComplaint bookingComplaint = bookingComplaintService.getDetailById(id);
         if (bookingComplaint != null) {
             resultJson.put("message", "查询成功");
             resultJson.put("code", 200);
@@ -127,6 +234,7 @@ public class bookComplainAction extends BaseController implements ServletRequest
             resultJson.put("message", "无数据无法导出");
             ResponseUtil.writeJson(ServletActionContext.getResponse(),
                     resultJson.toString());
+            return null;
         }
         List<Vector> vectorsList = new ArrayList<>();
         for(BookingComplaint bookingComplaint : list){

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

@@ -223,6 +223,15 @@ public class houseAction extends BaseController implements ModelDriven<HouseDto>
 
             //2023-09-19 A-jax 房型数量必须和房间数量一致
             List<String> houseNumberList = Arrays.asList(houseNumber.split(","));
+
+            long disNum = houseNumberList.stream().distinct().count();
+            if(houseNumberList.size() != disNum){
+                resultJson.put("message", "房间号存在重复数据");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
+
             if(house.getNumber().intValue() != houseNumberList.size()){
                 resultJson.put("message", "房型数量与房间数量不一致");
                 resultJson.put("code", 500);

mhotel/src/com/happy/dao/BookingComplainDao.java

@@ -18,6 +18,9 @@ public interface BookingComplainDao {
     int queryTotal(String sqlx);
 
     BookingComplaint getById(String id);
+
+    BookingComplaint getDetailById(String id);
+
     String insert(String bookingId, String hotelId, String houseId, String title, String content, String createId, String createDate, String modifyDate);
 
     List<ComplaintPageVo> complaintPage(String usersId, int page, int rows);
@@ -30,5 +33,5 @@ public interface BookingComplainDao {
 
     DetailsVo detailsVo(String complaintId);
 
-
+    int updateComplain(String id,String status);
 }

mhotel/src/com/happy/dao/BookingComplaintProgressDao.java

@@ -1,7 +1,7 @@
 package com.happy.dao;
 
 public interface BookingComplaintProgressDao {
-    int insert(String complaintId, String createId, String createDate, String modifyDate);
+    int insert(String complaintId, String createId, String createDate, String modifyDate, String status);
 
 
 

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

@@ -204,11 +204,11 @@ public class AdminManagerImplDao implements AdminManagerDao {
     @Override
     public List<ManageHouseDto> getTotalHouseCount() {
         String sql = "select (select Count(*) from house_number where status = 1 and house_id in (\n" +
-                "select id from house where `status` = 1 and manager_id in (\n" +
+                "select id from house where `status` = 1 and manager_id in (select manager_id from hotel where status = 1 and manager_id in\n" +
                 "(select id from admin_manager\n" +
                 "where hotel_township = hotel_dict.id and status =1)))) as total_house_num," +
                 "(select Count(*) from house_number_status where 1 = 1 and date_format(set_date, '%Y-%m-%d') = date_format(NOW(), '%Y-%m-%d') and status in (2,5,6) and number_id in \n" +
-                "(select id from house_number where status = 1 and house_id in (select id from house where `status` = 1 and manager_id in (\n" +
+                "(select id from house_number where status = 1 and house_id in (select id from house where `status` = 1 and manager_id in (select manager_id from hotel where status = 1 and manager_id in\n" +
                 "(select id from admin_manager\n" +
                 "where hotel_township = hotel_dict.id and status =1))))) as used_house_num\n" +
                 ",hotel_dict.name from hotel_dict where code = 10 ";

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

@@ -1,9 +1,6 @@
 package com.happy.dao.impl;
 
-import com.happy.Model.Booking;
-import com.happy.Model.BookingComplaint;
-import com.happy.Model.HotelCoupon;
-import com.happy.Model.House;
+import com.happy.Model.*;
 import com.happy.Until.SqlUtil;
 import com.happy.Until.UUIDUtil;
 import com.happy.dao.BookingComplainDao;
@@ -35,7 +32,7 @@ public class BookingComplainImplDao implements BookingComplainDao {
     }
 
     private String selectSql = "select " +
-            "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" +
+            "u.user_phone as complainPhone,m.corpn_phone as hotelPhone,a.id,a.remark,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 "+
@@ -44,7 +41,7 @@ public class BookingComplainImplDao implements BookingComplainDao {
             " 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,(SELECT bcp.progress_type FROM booking_complaint_progress bcp WHERE bcp.complaint_id = a.id ORDER BY bcp.create_date DESC LIMIT 1 ) AS status" +
+            " bk.order_num,u.user_phone as complainPhone,m.corpn_phone as hotelPhone,a.id,a.remark,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,(SELECT bcp.progress_type FROM booking_complaint_progress bcp WHERE bcp.complaint_id = a.id ORDER BY bcp.create_date DESC LIMIT 1 ) AS status" +
             " from booking_complaint a " +
             " left join house h on a.house_id = h.id " +
             " left join hotel h2 on a.hotel_id = h2.id "+
@@ -55,7 +52,7 @@ public class BookingComplainImplDao implements BookingComplainDao {
 
 
     private String selectLeftSql1 = "select * from (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,(SELECT bcp.progress_type FROM booking_complaint_progress bcp WHERE bcp.complaint_id = a.id ORDER BY bcp.create_date DESC LIMIT 1 ) AS status" +
+            " bk.order_num,u.user_phone as complainPhone,m.corpn_phone as hotelPhone,a.id,a.remark,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,(SELECT bcp.progress_type FROM booking_complaint_progress bcp WHERE bcp.complaint_id = a.id ORDER BY bcp.create_date DESC LIMIT 1 ) AS status" +
             " from booking_complaint a " +
             " left join house h on a.house_id = h.id " +
             " left join hotel h2 on a.hotel_id = h2.id "+
@@ -64,6 +61,15 @@ public class BookingComplainImplDao implements BookingComplainDao {
             " left join users u on a.create_id = u.id ) t" +
             " where 1=1 ";
 
+    private String detailSql = "select " +
+            "u.user_phone as complainPhone,m.corpn_phone as hotelPhone,a.id,a.remark,a.booking_id,a.hotel_id,a.house_id,a.title,a.content,a.create_id,a.create_date,a.modify_date,h.h_name as house_name,h2.hname as hotel_name,(SELECT bcp.progress_type FROM booking_complaint_progress bcp WHERE bcp.complaint_id = a.id ORDER BY bcp.create_date DESC LIMIT 1 ) AS status" +
+            " 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 admin_manager m on h2.manager_id = m.id " +
+            " left join users u on a.create_id = u.id " +
+            " where a.status != 0 ";
+
     @Override
     public List<BookingComplaintVo> queryPage(String sqlx, int page, int rows) {
         SqlUtil.filterKeyword(sqlx);
@@ -113,6 +119,22 @@ public class BookingComplainImplDao implements BookingComplainDao {
     }
 
     @Override
+    public BookingComplaint getDetailById(String id) {
+        String sql = detailSql + " and a.id = :id";
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        sps.addValue("id", id);
+        List<BookingComplaint> list = null;
+        try{
+            list = namedParameterJdbcTemplate.query(sql, sps,
+                    new BeanPropertyRowMapper<>(BookingComplaint.class));
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        if(list != null && list.size()>0) return list.get(0);
+        return null;
+    }
+
+    @Override
     public String insert(String bookingId, String hotelId, String houseId, String title, String content, String createId, String createDate, String modifyDate) {
         String sql = "insert into `booking_complaint` (id,booking_id,hotel_id,house_id,title,content,create_id,create_date,modify_date,status)" +
                 " values (:id,:booking_id,:hotel_id,:house_id,:title,:content,:create_id,:create_date,:modify_date,:status)";
@@ -259,4 +281,20 @@ public class BookingComplainImplDao implements BookingComplainDao {
         if(list != null && list.size()>0) return list.get(0);
         return null;
     }
+
+    @Override
+    public int updateComplain(String id,String status) {
+
+        String sql= " update `booking_complaint` set "+status+" where id=:id";
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        sps.addValue("id", id);
+
+        int num = 0;
+        try {
+            num = namedParameterJdbcTemplate.update(sql, sps);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return num;
+    }
 }

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

@@ -24,11 +24,12 @@ public class BookingComplaintProgressImplDao implements BookingComplaintProgress
     }
 
     @Override
-    public int insert(String complaintId, String createId, String createDate, String modifyDate) {
-        String sql = "INSERT INTO booking_complaint_progress (id, complaint_id, progress_type, create_id,create_date,modify_date,status) VALUES (:id, :complaint_id, :progress_type, :create_id,:create_date,:modify_date,:status)";
+    public int insert(String complaintId, String createId, String createDate, String modifyDate, String progressType) {
+        String sql = "INSERT INTO booking_complaint_progress (id, complaint_id, progress_type, create_id,create_date,modify_date,status) " +
+                "VALUES (:id, :complaint_id, :progress_type, :create_id, :create_date, :modify_date, :status)";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("complaint_id",complaintId);
-        sps.addValue("progress_type",1);
+        sps.addValue("progress_type",progressType);
         sps.addValue("create_id",createId);
         sps.addValue("create_date",createDate);
         sps.addValue("modify_date",modifyDate);

mhotel/src/com/happy/service/BookingComplaintProgressService.java

@@ -2,7 +2,7 @@ package com.happy.service;
 
 public interface BookingComplaintProgressService {
 
-    int insert(String complaintId, String createId, String createDate, String modifyDate);
+    int insert(String complaintId, String createId, String createDate, String modifyDate, String status);
 
 
 

mhotel/src/com/happy/service/BookingComplaintService.java

@@ -33,6 +33,8 @@ public interface BookingComplaintService {
      */
     BookingComplaint getById(String id);
 
+    BookingComplaint getDetailById(String id);
+
     List<BookingComplaint> toComplainExcel(String sqlx);
 
     int insert(String bookingId, String hotelId, String houseId, String title, String content, String createId, String createDate, String modifyDate, List<String> pictureList);
@@ -41,4 +43,5 @@ public interface BookingComplaintService {
 
     ProgressDetailsVo progressDetails(String complaintId);
 
+    int updateComplain(String id,String status);
 }

mhotel/src/com/happy/service/impl/BookingComplaintImplService.java

@@ -61,6 +61,14 @@ public class BookingComplaintImplService implements BookingComplaintService {
     }
 
     @Override
+    public BookingComplaint getDetailById(String id) {
+        BookingComplaint bookingComplaint = bookingComplainDao.getDetailById(id);
+        List<FileInfo> fileInfos = fileDao.queryList("and link_id ='" + id + "'");
+        bookingComplaint.setFileInfos(fileInfos);
+        return bookingComplaint;
+    }
+
+    @Override
     public List<BookingComplaint> toComplainExcel(String sqlx) {
         return bookingComplainDao.toComplainExcel(sqlx);
     }
@@ -100,7 +108,7 @@ public class BookingComplaintImplService implements BookingComplaintService {
             i = fileService.batchInsertFile(fileInfoList);
         }
 
-        int cpInsert=bookingComplaintProgressService.insert(complaintId,createId,createDate,modifyDate);
+        int cpInsert=bookingComplaintProgressService.insert(complaintId,createId,createDate,modifyDate, "1");
 
         if (complaintId != null && i > 0 && cpInsert > 0) {
             return i;
@@ -197,5 +205,16 @@ public class BookingComplaintImplService implements BookingComplaintService {
     }
 
 
-
+    /**
+     * 更新投诉状态
+     *
+     * @param id
+     * @param status
+     * @return
+     */
+    @Override
+    public int updateComplain(String id,String status){
+        int result = bookingComplainDao.updateComplain(id, status);
+        return result;
+    }
 }

mhotel/src/com/happy/service/impl/BookingComplaintProgressImplService.java

@@ -14,8 +14,8 @@ public class BookingComplaintProgressImplService implements BookingComplaintProg
     public BookingComplaintProgressDao bookingComplaintProgressDao;
 
     @Override
-    public int insert(String complaintId, String createId, String createDate, String modifyDate) {
-        return bookingComplaintProgressDao.insert(complaintId,createId,createDate,modifyDate);
+    public int insert(String complaintId, String createId, String createDate, String modifyDate, String status) {
+        return bookingComplaintProgressDao.insert(complaintId,createId,createDate,modifyDate, status);
     }
 
 

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

@@ -28,6 +28,8 @@ public class BookingComplaintVo {
 
     private String status;//状态(0删除 1.处理中 2.已处理)
 
+    private String remark;//备注
+
     private String houseName; //房型名称
 
     private String hotelName; //酒店名称名称

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

@@ -1,11 +1,14 @@
 package com.happy.vo;
 
+import lombok.Data;
+
 /**
  * @Author: binguo
  * @Date: 2023/9/11 星期一 15:15
  * @Description: com.happy.vo
  * @Version: 1.0
  */
+@Data
 public class HousePriceDataVo {
     /**
      * 价格
@@ -22,49 +25,11 @@ public class HousePriceDataVo {
     /**
      * 房型ID
      */
-    private Integer houseId;
+    private String houseId;
     /**
      * 创建时间
      */
     private String createDate;
 
-    public Double getPrice() {
-        return price;
-    }
-
-    public void setPrice(Double price) {
-        this.price = price;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-
-    public Integer getHouseId() {
-        return houseId;
-    }
-
-    public void setHouseId(Integer houseId) {
-        this.houseId = houseId;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
 
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
 }

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

@@ -1,11 +1,14 @@
 package com.happy.vo;
 
+import lombok.Data;
+
 /**
  * @Author: binguo
  * @Date: 2023/9/11 星期一 15:15
  * @Description: com.happy.vo
  * @Version: 1.0
  */
+@Data
 public class HousePriceOneDataVo {
     /**
      * 价格
@@ -22,38 +25,6 @@ public class HousePriceOneDataVo {
     /**
      * 房型ID
      */
-    private Integer houseId;
-
-
-    public Double getPrice() {
-        return price;
-    }
-
-    public void setPrice(Double price) {
-        this.price = price;
-    }
-
-    public String getSetDate() {
-        return setDate;
-    }
-
-    public void setSetDate(String setDate) {
-        this.setDate = setDate;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public Integer getHouseId() {
-        return houseId;
-    }
+    private String houseId;
 
-    public void setHouseId(Integer houseId) {
-        this.houseId = houseId;
-    }
 }