From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/controller/PriceMngController.java | 44 ++++++++++++++++++++------------------------
1 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/PriceMngController.java b/src/main/java/com/nanometer/smartlab/controller/PriceMngController.java
index ad2586b..560ebc5 100644
--- a/src/main/java/com/nanometer/smartlab/controller/PriceMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/PriceMngController.java
@@ -88,7 +88,7 @@
private Boolean approvalFlag;
public Boolean getApprovalFlag() {
- String id=getUserId();
+ Long id=getUserId();
SysUser sysUser = sysUserService.getSysUser(id);
// 不是管理员时
if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
@@ -153,11 +153,11 @@
}
String controlProducts = opeApply.getReagent().getControlProducts();
- if (StringUtils.isNotBlank(controlProducts)) {
- String baseMetaValue = baseMetaService.getBaseMetaValue(controlProducts);
- if (StringUtils.isNotBlank(baseMetaValue) && !"15fc90a1f7bf43bda01313904b543195".equals(this.getUser().getRoleId())) {
- dangerousFlag = true;
- }
+ if (controlProducts!=null) {
+// String baseMetaValue = baseMetaService.getBaseMetaValue(controlProducts);
+// if (StringUtils.isNotBlank(baseMetaValue) && this.getUser().getRoleId()!=1l) {
+// dangerousFlag = true;
+// }
}
}
@@ -217,7 +217,7 @@
Map<String, Integer> tempMap = new HashMap<String,Integer>();
List<OpeApply> realDataList = new ArrayList<>();
//map=null;
- String approveUserId = getUserId();
+ Long approveUserId = getUserId();
if(selectedList!=null&selectedList.size()>0){
realDataList=selectedList;
}else {
@@ -295,15 +295,15 @@
dataRow.createCell(0).setCellValue(dataList.get(i).getApplyCode()== null ? "": String.valueOf(dataList.get(i).getApplyCode()));
dataRow.createCell(1).setCellValue(dataList.get(i).getReagent().getProductSn()== null ? "": String.valueOf(dataList.get(i).getReagent().getProductSn()));
dataRow.createCell(2).setCellValue(dataList.get(i).getReagent().getName()== null ? "": String.valueOf(dataList.get(i).getReagent().getName()));
- dataRow.createCell(3).setCellValue(dataList.get(i).getReagent().getControlProducts()== null ? "": String.valueOf(baseMetaService.getBaseMetaValue(dataList.get(i).getReagent().getControlProducts())));
- dataRow.createCell(4).setCellValue(dataList.get(i).getReagent().getReagentFormat()== null ? "": String.valueOf(baseMetaService.getBaseMetaValue(dataList.get(i).getReagent().getReagentFormat())));
- dataRow.createCell(5).setCellValue(dataList.get(i).getReagent().getMainMetering()== null ? "": String.valueOf(dataList.get(i).getReagent().getMainMetering())+baseMetaService.getBaseMetaValue(dataList.get(i).getReagent().getReagentUnit()));
+ dataRow.createCell(3).setCellValue(dataList.get(i).getReagent().getControlProducts()== null ? "": String.valueOf(dataList.get(i).getReagent().getControlProducts()));
+ dataRow.createCell(4).setCellValue(dataList.get(i).getReagent().getReagentFormat()== null ? "": String.valueOf(dataList.get(i).getReagent().getReagentFormat()));
+ dataRow.createCell(5).setCellValue(dataList.get(i).getReagent().getMainMetering()== null ? "": String.valueOf(dataList.get(i).getReagent().getMainMetering())+dataList.get(i).getReagent().getReagentUnit());
dataRow.createCell(6).setCellValue(dataList.get(i).getReagent().getPrice()== null ? "": String.valueOf(dataList.get(i).getReagent().getPrice()));
dataRow.createCell(7).setCellValue(String.valueOf(dataList.get(i).getNum()));
dataRow.createCell(8).setCellValue(dataList.get(i).getReagent().getCas()== null ? "": String.valueOf(dataList.get(i).getReagent().getCas()));
- dataRow.createCell(9).setCellValue(dataList.get(i).getReagent().getReagentCharacter()== null ? "": String.valueOf(baseMetaService.getBaseMetaValue(dataList.get(i).getReagent().getReagentCharacter())));
- 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(9).setCellValue(dataList.get(i).getReagent().getReagentCharacter()== null ? "": String.valueOf(dataList.get(i).getReagent().getReagentCharacter()));
+ dataRow.createCell(10).setCellValue(dataList.get(i).getReagent().getProductHome()== null ? "": String.valueOf(dataList.get(i).getReagent().getProductHome()));
+ dataRow.createCell(11).setCellValue(dataList.get(i).getReagent().getReagentType()== null ? "": String.valueOf(dataList.get(i).getReagent().getReagentType()));
dataRow.createCell(12).setCellValue(String.valueOf(dataList.get(i).getApplyUserName()));
dataRow.createCell(13).setCellValue(String.valueOf(dataList.get(i).getCreateTime()));
@@ -317,8 +317,8 @@
dataRow.createCell(15).setCellValue(String.valueOf(dataList.get(i).getApproveUserName()));
}
dataRow.createCell(16).setCellValue(String.valueOf(dataList.get(i).getStatus().getText()));
- SysProject project = sysProjectService.getProjectByProId(dataList.get(i).getObjective());
- dataRow.createCell(17).setCellValue(project.getProjectName()==null ?"":String.valueOf(project.getProjectName()));
+ // SysProject project = sysProjectService.getSysProject(dataList.get(i).getProjectId());
+ dataRow.createCell(17).setCellValue(dataList.get(i).getApplyUserProject()==null ?"":String.valueOf(dataList.get(i).getApplyUserProject()));
}
return hssfWorkbook;
@@ -339,12 +339,7 @@
}
for (OpeApply oa : this.selectedList) {
- if("gslab".equalsIgnoreCase(this.getActiveEnv())){
- oa.setStatus(ApplyStatus.APPROVED);
- }else{
- oa.setStatus(ApplyStatus.PENDING_APPROVAL);
- }
-
+ oa.setStatus(ApplyStatus.PENDING_APPROVAL);
this.opeApplyService.updateOpeApply(oa);
}
@@ -362,9 +357,9 @@
public List<OpeApply> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, Object> filters) {
List<OpeApply> list = null;
//try {
- String approveUserId = getUserId();
+ Long approveUserId = getUserId();
int count = 0;
- if (StringUtils.isNotBlank(approveUserId)) {
+ if (approveUserId!=null) {
count = opeApplyService.getOpeApplyTotalCountForApproval(applyUserName,approvaUserName,reagentName, startDeadline, endDeadline, status, null, approveUserId, null, null,null);
}
this.setRowCount(count);
@@ -405,7 +400,8 @@
// }
// }
// }
- return opeApplyService.getOpeApply(rowKey);
+ Long id=Long.valueOf(rowKey);
+ return opeApplyService.getOpeApply(id);
}
};
}
--
Gitblit v1.9.2