From aab1d1e20e7b4b72a9bd98c5d26fdfb087b4c57b Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期二, 02 二月 2021 18:07:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master --- src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java index 70a1d09..60d56e6 100644 --- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java +++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java @@ -245,16 +245,18 @@ map.put("barCode", "地址码"); map.put("location", "地址"); map.put("department", "部门"); + map.put("project", "课题组"); ExcelUtils.export2Excel(list,"实验室信息",map); } @Override - public List<Map> exportLabList(String type, String name) { + public List<Map> exportLabList(String type, String name,String project) { Map<String,String> params = new HashMap<>(); params.put("type", type); params.put("name", name); + params.put("project", project); return sysLaboratoryDao.exportLabList(params); } -- Gitblit v1.9.2