From 648449c0dc1db4531889a4689d45f0a442032d3a Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期二, 26 十月 2021 17:05:35 +0800
Subject: [PATCH] 申购管理的审批者--》如果申购人有课题组查到的审批者为申购人所在部门+所在课题组+是审批者+人员有效的以及申购人所在部门+无课题组+是审批者+人员有效的。如果申购人没有课题组查到的是申购人所在部门+是审批者+人员有效的
---
src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java b/src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java
index 1477f09..3fbd9b8 100644
--- a/src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java
@@ -475,7 +475,8 @@
}else {
dataRow.createCell(22).setCellValue(String.valueOf(company.getMetaValue()));
}
-
+ dataRow.createCell(23).setCellValue(String.valueOf(dataList.get(i).getStatus().getText()));
+ dataRow.createCell(24).setCellValue(String.valueOf(dataList.get(i).getOrderStatus().getText()));
}
return hssfWorkbook;
@@ -789,13 +790,12 @@
if( opeApply != null)
{
if(opeApply.getStockFlag()!=0){
- SysUser user1=null;
- if(opeApply.getBeforeApproveUserId()!=null&&!opeApply.getBeforeApproveUserId().equals("")){
- user1=sysUserService.getSysUserForSuppllier(opeApply.getBeforeApproveUserId());
- }else {
- user1 = sysUserService.getSysUserForSuppllier(opeApply.getApproveUserId());
- }
-
+// SysUser user1=null;
+// if(opeApply.getBeforeApproveUserId()!=null&&!opeApply.getBeforeApproveUserId().equals("")){
+// user1=sysUserService.getSysUserForSuppllier(opeApply.getBeforeApproveUserId());
+// }else {
+// user1 = sysUserService.getSysUserForSuppllier(opeApply.getApproveUserId());
+// }
//opeApply.setOwnerDepartment(user1.getDepartment());
//System projectUser=
opeApply.setOwnerDepartment(sysUserService.getSysUserForSuppllier(opeApply.getApplyUserId()).getDepartment());
@@ -832,6 +832,7 @@
{
tempMap.put(opeApply.getReagent().getId(), opeApply.getNum());
}
+ opeApply.setOrderStatus(order.getStatus());
realDataList.add(opeApply);
}
@@ -882,6 +883,8 @@
headerList.add("申购人");
headerList.add("部门");
headerList.add("单位");
+ headerList.add("申购单状态");
+ headerList.add("订单状态");
HSSFWorkbook hssfWorkbook =exportExcelNew(headerList, realDataList);
hssfWorkbook.write(out);
out.flush();
--
Gitblit v1.9.2