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 | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/RequireMngController.java b/src/main/java/com/nanometer/smartlab/controller/RequireMngController.java
index 2bf805d..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,8 +36,11 @@
private MenuController menuController;
@Resource
private OpeOrderService opeOrderService;
+ @Resource
+ private SysProjectDao sysProjectDao;
private LazyDataModel<OpeApply> dataModel;
+ private LazyDataModel<OpeApply> supplerRequireMngDataModel;
private OpeOrder opeOrder;
private List<OpeApply> selectedList;
private String reagentName;
@@ -50,7 +55,7 @@
return;
}
- Set<String> results = new HashSet<>();
+ Set<Long> results = new HashSet<>();
for(OpeApply item : selectedList)
{
results.add(item.getReagent().getSupplierId());
@@ -132,7 +137,7 @@
this.menuController.backToPage();
} catch (Exception e) {
logger.error("操作失败。", e);
- FacesUtils.warn("操作失败。");
+ FacesUtils.warn("操作失败,message="+e.getMessage());
}
}
@@ -143,10 +148,10 @@
public List<OpeApply> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, Object> filters) {
List<OpeApply> list = null;
try {
- int count = opeApplyService.getOpeApplyTotalCount(reagentName, startDeadline, endDeadline, ApplyStatus.APPROVED.getKey(), null, null, null,null,null,(byte)1);
+ int count = opeApplyService.getOpeApplyTotalCount(reagentName, startDeadline,null, endDeadline, ApplyStatus.APPROVED.getKey(), null, null, null,null,null,(byte)1);
this.setRowCount(count);
if (count > 0) {
- list = opeApplyService.getOpeApplyList(reagentName, startDeadline, endDeadline, ApplyStatus.APPROVED.getKey(), null, null, null, first, pageSize,null,null,(byte)1);
+ list = opeApplyService.getOpeApplyList(reagentName, startDeadline,null, endDeadline, ApplyStatus.APPROVED.getKey(), null, null, null, first, pageSize,null,null,(byte)1);
}
} catch (Exception e) {
logger.error(e);
@@ -167,13 +172,48 @@
// }
// }
// }
- return opeApplyService.getOpeApply(rowKey);
+ Long id=Long.valueOf(rowKey);
+ return opeApplyService.getOpeApply(id);
}
};
}
return dataModel;
}
+ public LazyDataModel<OpeApply> getSupplerRequireMngDataModel() {
+ return new LazyDataModel<OpeApply>() {
+ @Override
+ public List<OpeApply> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, Object> filters) {
+ List<OpeApply> list = null;
+ try {
+ int count = opeApplyService.getOpeApplySupplerRequireMngTotalCount(getUser(),reagentName, startDeadline, endDeadline, ApplyStatus.APPROVED.getKey(),(byte)1);
+ this.setRowCount(count);
+ if (count > 0) {
+ list = opeApplyService.getOpeApplySupplerRequireMngList(getUser(),reagentName, startDeadline, endDeadline, ApplyStatus.APPROVED.getKey(), first, pageSize,(byte)1);
+ }
+ } catch (Exception e) {
+ logger.error(e);
+ }
+ selectedList = null;
+ return list;
+ }
+
+ @Override
+ public OpeApply getRowData(String 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