From 374fb9d9369271b9b858e11a8612850ad3560936 Mon Sep 17 00:00:00 2001 From: kongzy <kongzy> Date: 星期三, 11 十月 2023 10:22:40 +0800 Subject: [PATCH] 新增试剂供应商变更需求 --- src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java b/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java index 4fcfea1..b49b41a 100644 --- a/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java +++ b/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java @@ -255,6 +255,7 @@ headerList.add("含税售价"); headerList.add("CAS号"); headerList.add("危险性质"); + headerList.add("供应商"); headerList.add("厂家"); headerList.add("试剂类型"); headerList.add("申购数量"); @@ -266,6 +267,7 @@ headerList.add("二级审批者"); headerList.add("订单状态"); headerList.add("审批批注"); + HSSFWorkbook hssfWorkbook =exportExcelNew(headerList, realDataList); hssfWorkbook.write(out); out.flush(); @@ -342,24 +344,27 @@ dataRow.createCell(6).setCellValue(dataList.get(i).getReagent().getPrice()== null ? "": String.valueOf(dataList.get(i).getReagent().getPrice())); dataRow.createCell(7).setCellValue(dataList.get(i).getReagent().getCas()== null ? "": String.valueOf(dataList.get(i).getReagent().getCas())); dataRow.createCell(8).setCellValue(dataList.get(i).getReagent().getReagentCharacter()== null ? "": String.valueOf(baseMetaService.getBaseMetaValue(dataList.get(i).getReagent().getReagentCharacter()))); - dataRow.createCell(9).setCellValue(dataList.get(i).getReagent().getProductHomeName()== null ? "": String.valueOf(dataList.get(i).getReagent().getProductHomeName())); - 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(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(9).setCellValue(dataList.get(i).getReagent().getSupplierName()== null ? "": String.valueOf(dataList.get(i).getReagent().getSupplierName())); - dataRow.createCell(15).setCellValue(String.valueOf(dataList.get(i).getCreateTime())); + dataRow.createCell(10).setCellValue(dataList.get(i).getReagent().getProductHomeName()== null ? "": String.valueOf(dataList.get(i).getReagent().getProductHomeName())); + dataRow.createCell(11).setCellValue(dataList.get(i).getReagent().getReagentType()== null ? "": String.valueOf(baseMetaService.getBaseMetaValue(dataList.get(i).getReagent().getReagentType()))); + dataRow.createCell(12).setCellValue(String.valueOf(dataList.get(i).getNum())); + dataRow.createCell(13).setCellValue(String.valueOf(dataList.get(i).getApplyUserName())); + dataRow.createCell(14).setCellValue(dataList.get(i).getApplyUserProject() == null?"":String.valueOf(dataList.get(i).getApplyUserProject())); + dataRow.createCell(15).setCellValue(dataList.get(i).getApplyUserDepartment() == null?"":String.valueOf(dataList.get(i).getApplyUserDepartment())); + + + dataRow.createCell(16).setCellValue(String.valueOf(dataList.get(i).getCreateTime())); // SysUser u=sysUserService.getSysUser(dataList.get(i).getApproveUserId()); - dataRow.createCell(16).setCellValue(String.valueOf(dataList.get(i).getFirName())); + dataRow.createCell(17).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(17).setCellValue(String.valueOf(dataList.get(i).getApproveUserName())); + dataRow.createCell(18).setCellValue(String.valueOf(dataList.get(i).getApproveUserName())); } //dataRow.createCell(14).setCellValue(String.valueOf(u.getName())); - 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())); + dataRow.createCell(19).setCellValue(String.valueOf(dataList.get(i).getStatus().getText())); + dataRow.createCell(20).setCellValue(dataList.get(i).getMemo()==null ?"":String.valueOf(dataList.get(i).getMemo())); } return hssfWorkbook; -- Gitblit v1.9.2