From 648449c0dc1db4531889a4689d45f0a442032d3a Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期二, 26 十月 2021 17:05:35 +0800 Subject: [PATCH] 申购管理的审批者--》如果申购人有课题组查到的审批者为申购人所在部门+所在课题组+是审批者+人员有效的以及申购人所在部门+无课题组+是审批者+人员有效的。如果申购人没有课题组查到的是申购人所在部门+是审批者+人员有效的 --- src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java | 18 +++++++++++++++--- 1 files changed, 15 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..0a591e5 100644 --- a/src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java +++ b/src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java @@ -170,6 +170,7 @@ printTable.put("project", selectOne.getProject()); SysLaboratory sysLaboratory = sysLaboratoryService.getSysLaboratory(selectOne.getHouseId()); printTable.put("lab", sysLaboratory.getName()); + printTable.put("note",selectOne.getNote() == null?"":selectOne.getNote()); //整理数据 List<PersonUseDetail> applyInfo = opeUseFlowService.getApplyInfo(selectOne.getReceiptNumber()); assert applyInfo.size() > 0; @@ -323,16 +324,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