From 5e634c01ce9cb8294c6008a7ab76e5b82f469056 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 13 十二月 2021 16:12:18 +0800
Subject: [PATCH] 申购导出新增: 申购人的课题组,申购人的部门

---
 src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java b/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
index d2bc3cd..848286f 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
@@ -259,6 +259,8 @@
             headerList.add("试剂类型");
             headerList.add("申购数量");
             headerList.add("申购人");
+            headerList.add("申购人课题组");
+            headerList.add("申购人部门");
             headerList.add("申购日期");
             headerList.add("一级审批者");
             headerList.add("二级审批者");
@@ -344,16 +346,20 @@
             dataRow.createCell(10).setCellValue(dataList.get(i).getReagent().getReagentType()== null ? "": String.valueOf(baseMetaService.getBaseMetaValue(dataList.get(i).getReagent().getReagentType())));
             dataRow.createCell(11).setCellValue(String.valueOf(dataList.get(i).getNum()));
             dataRow.createCell(12).setCellValue(String.valueOf(dataList.get(i).getApplyUserName()));
-            dataRow.createCell(13).setCellValue(String.valueOf(dataList.get(i).getCreateTime()));
+            dataRow.createCell(13).setCellValue(dataList.get(i).getApplyUserProject() == null?"":String.valueOf(dataList.get(i).getApplyUserProject()));
+            dataRow.createCell(14).setCellValue(dataList.get(i).getApplyUserDepartment() == null?"":String.valueOf(dataList.get(i).getApplyUserDepartment()));
+
+
+            dataRow.createCell(15).setCellValue(String.valueOf(dataList.get(i).getCreateTime()));
            // SysUser u=sysUserService.getSysUser(dataList.get(i).getApproveUserId());
-            dataRow.createCell(14).setCellValue(String.valueOf(dataList.get(i).getFirName()));
+            dataRow.createCell(16).setCellValue(String.valueOf(dataList.get(i).getFirName()));
             if(dataList.get(i).getBeforeApproveUserId()!=null && !dataList.get(i).getBeforeApproveUserId().equals("")){
                 //u=sysUserService.getSysUser(dataList.get(i).getBeforeApproveUserId());
-                dataRow.createCell(15).setCellValue(String.valueOf(dataList.get(i).getApproveUserName()));
+                dataRow.createCell(17).setCellValue(String.valueOf(dataList.get(i).getApproveUserName()));
             }
             //dataRow.createCell(14).setCellValue(String.valueOf(u.getName()));
-            dataRow.createCell(16).setCellValue(String.valueOf(dataList.get(i).getStatus().getText()));
-            dataRow.createCell(17).setCellValue(dataList.get(i).getMemo()==null ?"":String.valueOf(dataList.get(i).getMemo()));
+            dataRow.createCell(18).setCellValue(String.valueOf(dataList.get(i).getStatus().getText()));
+            dataRow.createCell(19).setCellValue(dataList.get(i).getMemo()==null ?"":String.valueOf(dataList.get(i).getMemo()));
         }
 
         return hssfWorkbook;

--
Gitblit v1.9.2