Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java

@@ -110,6 +110,11 @@ public class CleanOrder extends TenantEntity {
      */
     private Long createById;
 
+    /**
+     * 是否退订（0：否，1：是）
+     */
+    private int isUnbooking;
+
     /**
      * 更新人id
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java

@@ -111,6 +111,11 @@ public class CleanOrderBo extends BaseEntity {
     @NotBlank(message = "联系电话不能为空", groups = {AddGroup.class, EditGroup.class})
     private String phone;
 
+    /**
+     * 是否退订（0：否，1：是）
+     */
+    private int isUnbooking;
+
     /**
      * 状态
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java

@@ -113,6 +113,11 @@ public class CleanOrderVo implements Serializable {
     @ExcelProperty(value = "联系人")
     private String persion;
 
+    /**
+     * 是否退订（0：否，1：是）
+     */
+    private int isUnbooking;
+
     /**
      * 联系电话
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java

@@ -201,6 +201,8 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
     public Boolean updateByBo(CleanOrderBo bo) {
         CleanOrder update = MapstructUtils.convert(bo, CleanOrder.class);
         validEntityBeforeSave(update);
+        update.setStarTime(String.valueOf(new DateTime(bo.getStarTime()).toLocalDateTime()));
+        update.setEndTime(String.valueOf(new DateTime(bo.getStarTime()).toLocalDateTime()));
         return baseMapper.updateById(update) > 0;
     }