From 5758b702aceacd76f2a1e1a63d848cd4948e99e1 Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期五, 02 七月 2021 10:15:52 +0800 Subject: [PATCH] 导出试剂流向,修改个人领用查询 --- src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java b/src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java index 6c0e9a5..fdc21d8 100644 --- a/src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java +++ b/src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java @@ -323,16 +323,27 @@ } public Date getStartTime() { - return startTime; + if (null == startTime){ + Date now = new Date(); + Calendar cal = Calendar.getInstance(); + cal.setTime(now); + cal.add(Calendar.DATE, -7); + return cal.getTime(); + }else { + return startTime; + } } public void setStartTime(Date startTime) { this.startTime = startTime; } - public Date getEndTime() { - return endTime; + if (null == endTime){ + return new Date(); + }else { + return endTime; + } } public void setEndTime(Date endTime) { -- Gitblit v1.9.2