diff --git a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearPayableBo.java b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearPayableBo.java index a567737..b26dcdb 100644 --- a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearPayableBo.java +++ b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearPayableBo.java @@ -74,6 +74,10 @@ public class GearPayableBo extends BaseEntity { //采购详情id private Long detailId; - + //时间范围筛选 + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date startTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endTime; } diff --git a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearReceivableBo.java b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearReceivableBo.java index ddc4236..4594d4d 100644 --- a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearReceivableBo.java +++ b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearReceivableBo.java @@ -72,5 +72,11 @@ public class GearReceivableBo extends BaseEntity { */ private String remark; + //时间范围筛选 + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date startTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endTime; + } diff --git a/gear-oa/src/main/java/com/gear/oa/service/impl/GearPayableServiceImpl.java b/gear-oa/src/main/java/com/gear/oa/service/impl/GearPayableServiceImpl.java index 6516fc9..37a7dae 100644 --- a/gear-oa/src/main/java/com/gear/oa/service/impl/GearPayableServiceImpl.java +++ b/gear-oa/src/main/java/com/gear/oa/service/impl/GearPayableServiceImpl.java @@ -73,6 +73,8 @@ public class GearPayableServiceImpl implements IGearPayableService { lqw.eq(bo.getPaidAmount() != null, "p.paid_amount", bo.getPaidAmount()); lqw.eq(bo.getBalanceAmount() != null, "p.balance_amount", bo.getBalanceAmount()); lqw.eq(StringUtils.isNotBlank(bo.getStatus()), "p.status", bo.getStatus()); + //按照时间段筛选 用创建时间比较 + lqw.between(bo.getStartTime() != null && bo.getEndTime() != null, "p.create_time", bo.getStartTime(), bo.getEndTime()); return lqw; } /** diff --git a/gear-oa/src/main/java/com/gear/oa/service/impl/GearReceivableServiceImpl.java b/gear-oa/src/main/java/com/gear/oa/service/impl/GearReceivableServiceImpl.java index bd8177b..2a28606 100644 --- a/gear-oa/src/main/java/com/gear/oa/service/impl/GearReceivableServiceImpl.java +++ b/gear-oa/src/main/java/com/gear/oa/service/impl/GearReceivableServiceImpl.java @@ -73,6 +73,8 @@ public class GearReceivableServiceImpl implements IGearReceivableService { lqw.eq(bo.getPaidAmount() != null, "r.paid_amount", bo.getPaidAmount()); lqw.eq(bo.getBalanceAmount() != null, "r.balance_amount", bo.getBalanceAmount()); lqw.eq(StringUtils.isNotBlank(bo.getStatus()), "r.status", bo.getStatus()); + //按照时间段筛选 用创建时间比较 + lqw.between(bo.getStartTime() != null && bo.getEndTime() != null, "r.create_time", bo.getStartTime(), bo.getEndTime()); return lqw; } /**