From dd8795a2675e32b25abe98f644f80d5f72fadb90 Mon Sep 17 00:00:00 2001 From: kongzy <kongzy> Date: 星期三, 01 十一月 2023 14:08:55 +0800 Subject: [PATCH] update icon --- src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 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..8e06384 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; @@ -215,6 +216,23 @@ } personUseDetail = opeUseFlowService.getApplyInfo(selectOne.getReceiptNumber()); + + } + + /** + * @Description: 导出详情 + */ + public void exportDetail() throws Exception { + try { + if (startTime == null || endTime == null){ FacesUtils.warn("请选择日期范围");return;} + + List<Map> list = opeUseFlowService.selectExportDetail(reagentCode, getUserId(), startTime, endTime, receiptNumber, department, project, applyPerson, reagentName); + if (list == null || list.size() < 1) {FacesUtils.warn("没有数据导出");return;} + opeUseFlowService.export22Excel(list); + } catch (Exception e) { + e.printStackTrace(); + FacesUtils.warn("导出失败"); + } } @@ -323,16 +341,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