合并代码

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

@@ -29,6 +29,9 @@ public class BookingComment {
     //    评论订单id
     private String bookingId;
 
+    //    评论订单号
+    private String order_num;
+
     //    评论民宿id
     private String hotelId;
 

mhotel/src/com/happy/Until/TimeExchange.java

@@ -263,6 +263,17 @@ public class TimeExchange {
         return simpleDateFormat.format(nowTime2.getTime());
     }
 
+    public static String getWeek(String sdate) throws ParseException {
+        // 再转换为时间
+        Date date = StringToDate(sdate,"yyyy-MM-dd");
+        Calendar c = Calendar.getInstance();
+        c.setTime(date);
+        // int hour=c.get(Calendar.DAY_OF_WEEK);
+        // hour中存的就是星期几了，其范围 1~7
+        // 1=星期日 7=星期六，其他类推
+        return new SimpleDateFormat("EEEE").format(c.getTime());
+    }
+
     // 今天星期几
     public static String getWeek() throws ParseException {
         String[] weeks = {"7","1","2","3","4","5","6"};

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

@@ -30,10 +30,10 @@ public class HouseNumberStatusAction extends BaseController implements ModelDriv
     /**
      * 根据年份获取节假日数据
      */
-    public String queryHoliday(){
+    public String queryHoliday() {
         String year = houseNumberStatusDto.getYear();
 
-        if(year.length() > 4){
+        if (year.length() > 4) {
             ResUtil.writeJson(ServletActionContext.getResponse(), new JSONObject() {{
                 put("message", "请输入年份");
                 put("code", 500);
@@ -41,7 +41,7 @@ public class HouseNumberStatusAction extends BaseController implements ModelDriv
             return null;
         }
 
-        if(year == null){
+        if (year == null) {
             ResUtil.writeJson(ServletActionContext.getResponse(), new JSONObject() {{
                 put("message", "请传入参数");
                 put("code", 500);
@@ -52,7 +52,7 @@ public class HouseNumberStatusAction extends BaseController implements ModelDriv
 
         List<Holiday> days = getYearHoliday("2023");
 
-        if(days == null){
+        if (days == null) {
             ResUtil.writeJson(ServletActionContext.getResponse(), new JSONObject() {{
                 put("message", "第三方接口调用失败");
                 put("code", 500);
@@ -60,7 +60,7 @@ public class HouseNumberStatusAction extends BaseController implements ModelDriv
             return null;
         }
 
-        if(days.size() <= 0){
+        if (days.size() <= 0) {
             ResUtil.writeJson(ServletActionContext.getResponse(), new JSONObject() {{
                 put("message", "第三方接口调用失败");
                 put("code", 500);
@@ -71,7 +71,7 @@ public class HouseNumberStatusAction extends BaseController implements ModelDriv
         houseNumberStatusService.deleteHolidayByYear(year);
 
         int lenegth = houseNumberStatusService.saveHolidayBatch(days);
-        if(lenegth <= 0){
+        if (lenegth <= 0) {
             ResUtil.writeJson(ServletActionContext.getResponse(), new JSONObject() {{
                 put("message", "节假日数据存储失败");
                 put("code", 500);
@@ -91,13 +91,13 @@ public class HouseNumberStatusAction extends BaseController implements ModelDriv
      */
     public void queryData() {
         JSONObject objects = houseNumberStatusService.queryData(houseNumberStatusDto);
-        if (objects != null){
+        if (objects != null) {
             ResUtil.writeJson(ServletActionContext.getResponse(), new JSONObject() {{
                 put("message", "请求成功");
                 put("code", 200);
                 put("data", objects);
             }}.toString());
-        }else {
+        } else {
             ResUtil.writeJson(ServletActionContext.getResponse(), new JSONObject() {{
                 put("message", "该房型未新增房间号");
                 put("code", 200);

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

@@ -57,8 +57,8 @@ public class bookCommentAction extends BaseController implements ServletRequestA
             s2.append(" or a.createName like '%").append(keywords).append("%')");
         }
         if (score != null){
-            s1.append(" and a.score >= ").append(score).append(" ");
-            s2.append(" and a.score >= ").append(score).append(" ");
+            s1.append(" and a.score = ").append(score).append(" ");
+            s2.append(" and a.score = ").append(score).append(" ");
         }
         if (commentStartTime != null){
             s1.append(" and DATE_FORMAT(a.create_date, '%Y-%m-%d') >= '").append(commentStartTime).append("' ");

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

@@ -11,6 +11,8 @@ public interface HouseNumberStatusDao {
 
     int saveHolidayBatch(List<Holiday> list);
 
+    List<Holiday> queryHolidays(String year, String startDate, String endDates);
+
     int saveBatch(List<HouseNumberStatus> list);
 
     int updateHouseNumberStatus(String bookId);

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

@@ -33,7 +33,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.id,b.order_num,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, DATE_FORMAT(a.create_date, '%Y-%m-%d %H:%i:%s') create_date, DATE_FORMAT(a.modify_date, '%Y-%m-%d %H:%i:%s') modify_date,a.status,DATE_FORMAT(b.check_out_time, '%Y-%m-%d %H:%i:%s') as checkOutTime,c.user_name as createName,b.hotel_manager_id,c.head_photo as headPhoto" +
             " from booking_comment a" +
             " left join booking b on b.id = a.booking_id" +

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

@@ -38,27 +38,28 @@ public class HouseNumberStatusImplDao implements HouseNumberStatusDao {
     }
 
     /**
-     * ??????????
-     * @param year ??
+     * 按年份删除节假日数据
+     *
+     * @param year 年份
      * @return
      */
     @Override
     public int deleteHolidayByYear(String year) {
         String sql = "delete from holiday where year = :year";
         MapSqlParameterSource sps = new MapSqlParameterSource();
-        sps.addValue("year",year);
+        sps.addValue("year", year);
         int num = 0;
-        try{
+        try {
             num = namedParameterJdbcTemplate.update(sql, sps);
-        }
-        catch(Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return num;
     }
 
     /**
-     * 2023-09-20 a-jax ?????????
+     * 2023-09-20 a-jax 批量新增节假日数据
+     *
      * @param list
      * @return
      */
@@ -82,6 +83,25 @@ public class HouseNumberStatusImplDao implements HouseNumberStatusDao {
         return m.length;
     }
 
+
+    /**
+     * 根据开始时间和年份查询节假日数据
+     */
+    public List<Holiday> queryHolidays(String year, String startDate, String endDates) {
+        String sql = "select * from holiday where date >=:startDate and date <=:endDate and year =:year order by date";
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        sps.addValue("startDate", startDate);
+        sps.addValue("endDate", endDates);
+        sps.addValue("year", year);
+        List<Holiday> list = namedParameterJdbcTemplate.query(sql, sps, new BeanPropertyRowMapper<>(Holiday.class));
+
+        if (list != null && list.size() > 0) {
+            return list;
+        }
+        return null;
+    }
+
+
     @Override
     public int saveBatch(List<HouseNumberStatus> list) {
         SqlParameterSource[] params = SqlParameterSourceUtils.createBatch(list.toArray());
@@ -94,17 +114,16 @@ public class HouseNumberStatusImplDao implements HouseNumberStatusDao {
 
     @Override
     public int updateHouseNumberStatus(String bookId) {
-        StringBuffer stringBuffer =  new StringBuffer("update house_number_status set status = :status, modify_date = :modifyDate");
+        StringBuffer stringBuffer = new StringBuffer("update house_number_status set status = :status, modify_date = :modifyDate");
         MapSqlParameterSource sps = new MapSqlParameterSource();
         stringBuffer.append("  where booking_id=:booking_id  ");
-        sps.addValue("status",0);
-        sps.addValue("booking_id",bookId);
+        sps.addValue("status", 0);
+        sps.addValue("booking_id", bookId);
         sps.addValue("modifyDate", UUIDUtil.getNewDate());
         int num = 0;
-        try{
+        try {
             num = namedParameterJdbcTemplate.update(stringBuffer.toString(), sps);
-        }
-        catch(Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return num;
@@ -145,12 +164,12 @@ public class HouseNumberStatusImplDao implements HouseNumberStatusDao {
         SqlUtil.filterKeyword(sqlx);
         String sql = "select id, number_id, booking_id, close_type, remark, date_format(set_date, '%Y-%m-%d') as set_date, create_id, date_format(create_date, '%Y-%m-%d %H:%i:%s') as create_date, date_format(modify_date, '%Y-%m-%d %H:%i:%s') as modify_date, status from house_number_status where 1 = 1 and status != 0" + sqlx;
         List<HouseNumberStatus> list = null;
-        try{
+        try {
             list = namedParameterJdbcTemplate.query(sql, new BeanPropertyRowMapper<>(HouseNumberStatus.class));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        if(list != null && list.size()>0) return list;
+        if (list != null && list.size() > 0) return list;
         return null;
     }
 

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

@@ -12,6 +12,8 @@ public interface HouseNumberStatusService {
 
     int saveHolidayBatch(List<Holiday> list);
 
+    List<Holiday> queryHolidays(String year, String startDate, String endDates);
+
     int saveBatch(List<HouseNumberStatus> list);
 
     int updateHouseNumberStatus(String bookId);

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

@@ -7,6 +7,7 @@ import com.happy.Model.HouseNumber;
 import com.happy.Model.HouseNumberStatus;
 import com.happy.Until.DateUtil;
 import com.happy.Until.Func;
+import com.happy.Until.TimeExchange;
 import com.happy.dao.HouseNumberDao;
 import com.happy.dao.HouseNumberStatusDao;
 import com.happy.dao.HousePriceDao;
@@ -24,6 +25,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.beans.PropertyDescriptor;
+import java.text.ParseException;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -51,10 +54,19 @@ public class HouseNumberStatusImplService implements HouseNumberStatusService {
     }
 
     @Override
+    public List<Holiday> queryHolidays(String year, String startDate, String endDates) {
+
+        List<Holiday> list = houseNumberStatusDao.queryHolidays(year, startDate, endDates);
+        return list;
+    }
+
+    @Override
     public int saveBatch(List<HouseNumberStatus> list) {
         return houseNumberStatusDao.saveBatch(list);
     }
 
+
+
     @Override
     public int updateHouseNumberStatus(String bookId) {
         return houseNumberStatusDao.updateHouseNumberStatus(bookId);
@@ -180,11 +192,27 @@ public class HouseNumberStatusImplService implements HouseNumberStatusService {
                     datas.add(houseJsonObject);
                 }
             }));
+
+            List<Holiday> holidays = houseNumberStatusDao.queryHolidays( String.valueOf(LocalDate.now().getYear()),TimeExchange.DateToString(startDate,"yyyy-MM-dd"),TimeExchange.DateToString(endDate,"yyyy-MM-dd"));
+
             ArrayList<JSONObject> dataTimes = new ArrayList<>();
             dateListBetween.forEach(date -> {
                 JSONObject dataTime = new JSONObject();
                 dataTime.put("dateStr", date);
                 dataTime.put("roomSum", getSum(date, houseNumberList));
+                //2023-09-20 A-jax 添加 星期 节假日 是否休息
+                try {
+                    dataTime.put("weekStr", TimeExchange.getWeek(date));//星期
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+                Optional<Holiday> holiday = holidays.stream().filter(e -> e.getDate().equals(date)).findFirst();
+                String holidayStr = null;
+                if(holiday != null && holiday.isPresent()){
+                    Holiday data = holiday.get();
+                    holidayStr = data.getIsRest().intValue() == 1 ? data.getName() : "班";
+                }
+                dataTime.put("holiday",holidayStr);//节假日
                 dataTimes.add(dataTime);
             });