字段修改is_delete改为status_del

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

@@ -56,7 +56,7 @@ public class Booking {
   private String refundTime; // 退款时间
   private String checkOutTime; // 离店时间
   private String remake; // 备注信息
-  private int isDelete; // 是否假删除：0删除，1正常
+  private int status_del; // 是否假删除：0删除，1正常
   private String liveTime;//入住时间
 
   private String lockTime; // 锁定时间
@@ -434,14 +434,6 @@ public class Booking {
     this.hotelManagerId = hotelManagerId;
   }
 
-  public int getIsDelete() {
-    return isDelete;
-  }
-
-  public void setIsDelete(int isDelete) {
-    this.isDelete = isDelete;
-  }
-
   public String getLockTime() {
     return lockTime;
   }
@@ -497,4 +489,12 @@ public class Booking {
   public void setHouseFileInfoList(List<FileInfo> houseFileInfoList) {
     this.houseFileInfoList = houseFileInfoList;
   }
+
+  public int getStatus_del() {
+    return status_del;
+  }
+
+  public void setStatus_del(int status_del) {
+    this.status_del = status_del;
+  }
 }

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

@@ -10,9 +10,9 @@ import org.apache.commons.lang.StringUtils;
 public class SqlUtil
 {
     /**
-     * 定义常用的 sql关键字(未检测|or |and)
+     * 定义常用的 sql关键字(未检测|or |and  |+|user())
      */
-    public static String SQL_REGEX = "extractvalue|updatexml|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare  |+|user()";
+    public static String SQL_REGEX = "extractvalue|updatexml|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare ";
 
     /**
      * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序）

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

@@ -120,7 +120,7 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
         // 通过用户id查询所有订单列表数据
 
         StringBuilder querySql = new StringBuilder("");
-        querySql.append(" and is_delete = 1");
+        querySql.append(" and status_del = 1");
         if (!Func.checkNull(userId)){
             querySql.append(" and create_userid = '").append(userId).append("' ");
         }

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

@@ -198,7 +198,6 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
     public String quearyBookPage(){
         JSONObject resultJson = new JSONObject();
         StringBuilder s1 = new StringBuilder("");
-        //s1.append(" and is_delete = 1");
         if(managerId!=null){
             s1.append(" and hotel_manager_id = '").append(managerId).append("'");
         }

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

@@ -39,7 +39,7 @@ public class BookImplDao implements BookDao {
             " house_areas, house_remake, DATE_FORMAT(order_start_time,'%Y-%m-%d %T') order_start_time, DATE_FORMAT(order_end_time,'%Y-%m-%d %T') order_end_time," +
             " order_live_time, order_remake, DATE_FORMAT(create_time,'%Y-%m-%d %T') create_time, create_userid, DATE_FORMAT(update_time,'%Y-%m-%d %T') update_time," +
             " DATE_FORMAT(pay_time,'%Y-%m-%d %T') pay_time, pay_account, pay_way, refund_way, refund_amount, DATE_FORMAT(refund_time,'%Y-%m-%d %T') refund_time," +
-            " DATE_FORMAT(check_out_time,'%Y-%m-%d %T') check_out_time,lock_time, remake, is_delete, DATE_FORMAT(live_time,'%Y-%m-%d %T') live_time";
+            " DATE_FORMAT(check_out_time,'%Y-%m-%d %T') check_out_time,lock_time, remake, status_del, DATE_FORMAT(live_time,'%Y-%m-%d %T') live_time";
 
 
     @Override
@@ -49,13 +49,13 @@ public class BookImplDao implements BookDao {
                 "hotel_config, hotel_type, hotel_is_canorder, hotel_is_order, hotel_is_checkout, house_id, house_name, house_config, " +
                 "house_unit_price, house_total_price, house_order_number, house_areas, house_remake, order_start_time, order_end_time," +
                 " order_live_time, order_remake, create_time, create_userid, update_time, pay_time, pay_account, pay_way, refund_way," +
-                " refund_amount, refund_time, check_out_time,lock_time, remake, is_delete) " +
+                " refund_amount, refund_time, check_out_time,lock_time, remake, status_del) " +
                 "VALUES (:id, :order_num, :order_status, :user_idnumber, :user_name, :user_phone, :hotel_id, :hotel_name, :hotel_hposition, " +
                 ":hotel_hposition_wens, :hotel_phone, :hotel_manager_id, :hotel_person, :hotel_township, :hotel_config, :hotel_type," +
                 " :hotel_is_canorder, :hotel_is_order, :hotel_is_checkout, :house_id, :house_name, :house_config, :house_unit_price," +
                 " :house_total_price, :house_order_number, :house_areas, :house_remake, :order_start_time, :order_end_time, :order_live_time," +
                 " :order_remake, :create_time, :create_userid, :update_time, :pay_time, :pay_account, :pay_way, :refund_way, :refund_amount," +
-                " :refund_time, :check_out_time,:lock_time, :remake, :is_delete)";
+                " :refund_time, :check_out_time,:lock_time, :remake, :status_del)";
 
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("order_num",book.getOrderNum());
@@ -100,7 +100,7 @@ public class BookImplDao implements BookDao {
         sps.addValue("check_out_time",book.getCheckOutTime());
         sps.addValue("lock_time",book.getLockTime());
         sps.addValue("remake", book.getRemake());
-        sps.addValue("is_delete", 1);
+        sps.addValue("status_del", 1);
         if(book.getId()==null){
             sps.addValue("id", UUIDUtil.generateID());
         } else{
@@ -128,7 +128,7 @@ public class BookImplDao implements BookDao {
                 " house_order_number = :house_order_number, house_areas = :house_areas, house_remake = :house_remake, order_start_time = :order_start_time," +
                 " order_end_time = :order_end_time, order_live_time = :order_live_time, order_remake = :order_remake, create_time = :create_time, create_userid = :create_userid," +
                 " update_time = :update_time, pay_time = :pay_time,pay_account = :pay_account, pay_way = :pay_way, refund_way = :refund_way,refund_amount = :refund_amount," +
-                " refund_time = :refund_time, check_out_time = :check_out_time,lock_time=:lock_time, remake = :remake, is_delete = :is_delete, live_time = :live_time  WHERE id = :id";
+                " refund_time = :refund_time, check_out_time = :check_out_time,lock_time=:lock_time, remake = :remake, status_del = :status_del, live_time = :live_time  WHERE id = :id";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("order_num",book.getOrderNum());
         sps.addValue("order_status",book.getOrderStatus());
@@ -172,7 +172,7 @@ public class BookImplDao implements BookDao {
         sps.addValue("check_out_time",book.getCheckOutTime());
         sps.addValue("remake", book.getRemake());
         sps.addValue("lock_time", book.getLockTime());
-        sps.addValue("is_delete", book.getIsDelete());  // 是否假删除：0删除，1正常
+        sps.addValue("status_del", book.getStatus_del());  // 是否假删除：0删除，1正常
         sps.addValue("live_time", book.getLiveTime());
         sps.addValue("id",book.getId());
 
@@ -256,7 +256,7 @@ public class BookImplDao implements BookDao {
     @Override
     public Double sumAccount(String sqlx){
         SqlUtil.filterKeyword(sqlx);
-        String sql = "select sum(pay_account) pay_account from booking where is_delete=1"+sqlx;
+        String sql = "select sum(pay_account) pay_account from booking where status_del=1"+sqlx;
         List<Booking> list = null;
         try{
             list = namedParameterJdbcTemplate.query(sql, new BeanPropertyRowMapper<>(Booking.class));

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

@@ -132,7 +132,7 @@ public class BookImplService implements BookService {
         if (book == null)
             return "无此订单，请重新查询";
 
-        book.setIsDelete(0);
+        book.setStatus_del(0);
         book.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
         bookDao.updateBooking(book);
         return null;