From 59d9ea33f503e363f2e2941c7c00cc9dd9d9d1c7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期二, 28 十一月 2023 11:00:42 +0800
Subject: [PATCH] 修改课题管理bug
---
src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java b/src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java
index fdc21d8..91bfc1b 100644
--- a/src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java
@@ -168,8 +168,10 @@
printTable.put("phone", selectOne.getPhone());
printTable.put("receiptNumber", selectOne.getReceiptNumber());
printTable.put("project", selectOne.getProject());
- SysLaboratory sysLaboratory = sysLaboratoryService.getSysLaboratory(selectOne.getHouseId());
+
+ SysLaboratory sysLaboratory = sysLaboratoryService.getSysLaboratorySimpleInfo(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;
@@ -218,6 +220,23 @@
}
+ /**
+ * @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("导出失败");
+ }
+
+ }
+
@SuppressWarnings("serial")
public LazyDataModel<OpeReagentStatus> getDataModel() {
if (this.dataModel == null) {
--
Gitblit v1.9.2