diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java index 75f9792..f0801ca 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java +++ b/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 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java index 7815d49..8601487 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java +++ b/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; + /** * 状态 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java index 50b286d..6c75b0c 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java +++ b/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; + /** * 联系电话 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java index 3d1400b..04fc408 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java +++ b/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; }