diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java index f5789de..58dc71e 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java @@ -16,6 +16,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * 进出账管理业务对象 sys_oa_finance @@ -145,4 +146,12 @@ public class SysOaFinanceBo extends BaseEntity { //cost_category varchar(32) 成本分类 private String costCategory; + //时间筛选 带时分秒的 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date beginCreateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endCreateTime; + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java index d98593d..505047c 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java @@ -199,8 +199,8 @@ public class SysOaFinanceServiceImpl implements ISysOaFinanceService { lqw.eq(StringUtils.isNotBlank(bo.getFinanceType()), "sof.finance_type", bo.getFinanceType()); lqw.eq(StringUtils.isNotBlank(bo.getSigningCompany()), "sof.signing_company", bo.getSigningCompany()); lqw.eq(Objects.nonNull(bo.getReceiveAccountId()) && bo.getReceiveAccountId()!=-1L, "sof.receive_account_id", bo.getReceiveAccountId()); - lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, - "sof.create_time", params.get("beginCreateTime"), params.get("endCreateTime")); + lqw.between(bo.getBeginCreateTime()!= null && bo.getEndCreateTime()!= null, + "sof.create_time", bo.getBeginCreateTime(), bo.getEndCreateTime()); lqw.orderByDesc("create_time"); return lqw; }