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 f0801ca..dafd652 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 @@ -113,7 +113,7 @@ public class CleanOrder extends TenantEntity { /** * 是否退订(0:否,1:是) */ - private int isUnbooking; + private Integer 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 8601487..c6a1e3c 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 @@ -114,7 +114,7 @@ public class CleanOrderBo extends BaseEntity { /** * 是否退订(0:否,1:是) */ - private int isUnbooking; + private Integer 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 6c75b0c..2017848 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 @@ -116,7 +116,7 @@ public class CleanOrderVo implements Serializable { /** * 是否退订(0:否,1:是) */ - private int isUnbooking; + private Integer isUnbooking; /** * 联系电话 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetServiceImpl.java index f75d55a..6302c19 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetServiceImpl.java @@ -139,11 +139,12 @@ public class MeetServiceImpl implements IMeetService { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByAsc(Meet::getId); lqw.like(StringUtils.isNotBlank(bo.getName()), Meet::getName, bo.getName()); - lqw.eq(StringUtils.isNotBlank(bo.getLocation()), Meet::getLocation, bo.getLocation()); - lqw.eq(bo.getPersonNumber() != null, Meet::getPersonNumber, bo.getPersonNumber()); - lqw.eq(bo.getBaseService() != null, Meet::getBaseService, bo.getBaseService()); - lqw.eq(bo.getBasePrice() != null, Meet::getBasePrice, bo.getBasePrice()); - lqw.eq(bo.getAttach() != null, Meet::getAttach, bo.getAttach()); +// lqw.eq(StringUtils.isNotBlank(bo.getLocation()), Meet::getLocation, bo.getLocation()); +// lqw.eq(bo.getPersonNumber() != null, Meet::getPersonNumber, bo.getPersonNumber()); +// lqw.eq(bo.getBaseService() != null, Meet::getBaseService, bo.getBaseService()); +// lqw.eq(bo.getBasePrice() != null, Meet::getBasePrice, bo.getBasePrice()); + lqw.eq(bo.getPrincipals() != null, Meet::getPrincipals, bo.getPrincipals()); + lqw.eq(bo.getStatus() != null, Meet::getStatus, bo.getStatus()); return lqw; }