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/RequireMngController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/RequireMngController.java b/src/main/java/com/nanometer/smartlab/controller/RequireMngController.java
index 02d6601..196fe11 100644
--- a/src/main/java/com/nanometer/smartlab/controller/RequireMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/RequireMngController.java
@@ -1,7 +1,9 @@
package com.nanometer.smartlab.controller;
+import com.nanometer.smartlab.dao.SysProjectDao;
import com.nanometer.smartlab.entity.OpeApply;
import com.nanometer.smartlab.entity.OpeOrder;
+import com.nanometer.smartlab.entity.SysProject;
import com.nanometer.smartlab.entity.enumtype.ApplyStatus;
import com.nanometer.smartlab.service.OpeApplyService;
import com.nanometer.smartlab.service.OpeOrderService;
@@ -34,6 +36,8 @@
private MenuController menuController;
@Resource
private OpeOrderService opeOrderService;
+ @Resource
+ private SysProjectDao sysProjectDao;
private LazyDataModel<OpeApply> dataModel;
private LazyDataModel<OpeApply> supplerRequireMngDataModel;
@@ -51,7 +55,7 @@
return;
}
- Set<String> results = new HashSet<>();
+ Set<Long> results = new HashSet<>();
for(OpeApply item : selectedList)
{
results.add(item.getReagent().getSupplierId());
@@ -133,7 +137,7 @@
this.menuController.backToPage();
} catch (Exception e) {
logger.error("操作失败。", e);
- FacesUtils.warn("操作失败。");
+ FacesUtils.warn("操作失败,message="+e.getMessage());
}
}
@@ -168,7 +172,8 @@
// }
// }
// }
- return opeApplyService.getOpeApply(rowKey);
+ Long id=Long.valueOf(rowKey);
+ return opeApplyService.getOpeApply(id);
}
};
}
@@ -195,11 +200,20 @@
@Override
public OpeApply getRowData(String rowKey) {
- return opeApplyService.getOpeApply(rowKey);
+ Long id=Long.valueOf(rowKey);
+ return opeApplyService.getOpeApply(id);
}
};
}
+ public String getProjectName(Long projectId){
+ if(projectId==null){
+ return "";
+ }
+ SysProject project= this.sysProjectDao.getSysProject(projectId);
+ return project!=null?project.getProjectName():"";
+ }
+
public OpeOrder getOpeOrder() {
return opeOrder;
}
--
Gitblit v1.9.2