From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Mon, 01 Jul 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java | 78 +++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java b/src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java
index 6f1f31e..6894d13 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java
@@ -6,6 +6,7 @@
import com.nanometer.smartlab.service.*;
import com.nanometer.smartlab.util.Constants;
import com.nanometer.smartlab.util.FacesUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.shiro.subject.Subject;
import org.primefaces.context.RequestContext;
@@ -17,11 +18,9 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
@Controller
@Scope("session")
@@ -42,11 +41,11 @@
private List<SysProject> selectedList;
private List<BasePage> basePageList;
private List<SysUser> sameDptUserList;
- private Map<String, String> userIdNameMap;
+ private Map<Long, String> userIdNameMap;
private List<SysUser> userSelectList;
private int action;
- private String projectId;
+ private String projectNo;
private String projectName;
private String sysUserName;
@@ -61,9 +60,12 @@
return userSelectList;
}
- public SysUser getSelectedUserById(String userId) {
- System.out.println(userId);
- return userSelectList.stream().filter(u->u.getId().equals(userId)).findFirst().get();
+ public SysUser getSelectedUserById(Long userId) {
+ SysUser sysUser=this.sysUserService.getSysUser(userId);
+ if(sysUser==null){
+ return new SysUser();
+ }
+ return sysUser;
}
public List<SysUser> getUserSelectList(String keyword) {
@@ -73,7 +75,7 @@
private void initUserSelectList() {
logger.info("WarehouseStockMngController initUserSelectList start");
- this.setUserSelectList(this.sysUserService.getSysUserList(null, null, null, null, null));
+ this.setUserSelectList(this.sysUserService.getSysUserList(null, null, null, null, null,null,null));
}
public void setUserSelectList(List<SysUser> userSelectList) {
this.userSelectList = userSelectList;
@@ -83,12 +85,12 @@
ProjectMngController.logger = logger;
}
- public String getProjectId() {
- return projectId;
+ public String getProjectNo() {
+ return projectNo;
}
- public void setProjectId(String projectId) {
- this.projectId = projectId;
+ public void setProjectNo(String projectNo) {
+ this.projectNo = projectNo;
}
public String getProjectName() {
@@ -138,16 +140,16 @@
return;
}
- if (this.sysProject.getSysUserId() == null || this.sysProject.getSysUserId()=="") {
+ if (this.sysProject.getSysUserId() == null) {
FacesUtils.warn("请选择课题负责人。");
return;
}
- if (this.sysProject.getProjectId() == null || this.sysProject.getProjectId()=="") {
+ if (this.sysProject.getProjectNo() == null || this.sysProject.getProjectNo()=="") {
FacesUtils.warn("请输入课题编号。");
return;
}else {
- if(sysProjectService.getProjectByProId(this.sysProject.getProjectId())!=null){
+ if(sysProjectService.getProjectByProNo(this.sysProject.getProjectNo())!=null){
FacesUtils.warn("课题编号已存在，请重新输入。");
return;
}
@@ -166,15 +168,15 @@
return;
}
- if (this.sysProject.getSysUserId() == null) {
+ if (this.sysProject.getSysUserId()==null) {
FacesUtils.warn("请选择课题负责人。");
return;
}
- if (this.sysProject.getProjectId() == null || this.sysProject.getProjectId()=="") {
+ if (this.sysProject.getProjectNo() == null || this.sysProject.getProjectNo()=="") {
FacesUtils.warn("请输入课题编号。");
return;
}else {
- SysProject sp=this.sysProjectService.getProjectByProId(this.sysProject.getProjectId());
+ SysProject sp=this.sysProjectService.getProjectByProNo(this.sysProject.getProjectNo());
if(sp!=null){
if(!sp.getId().equals(this.sysProject.getId())){
FacesUtils.warn("课题编号已存在，请重新输入。");
@@ -182,11 +184,7 @@
}
}
}
- SysProject pro=this.sysProjectService.getSysProject(this.sysProject.getId());
this.sysProjectService.updateSysProject(this.sysProject);
- this.opeApplyService.updateOpeApplyProject(this.sysProject.getProjectId(),pro.getProjectId());
-
-
FacesUtils.info("修改成功。");
RequestContext.getCurrentInstance().execute("PF('dialog').hide()");
}
@@ -233,11 +231,12 @@
List<SysProject> list = null;
initUserSelectList();
try {
- int count = sysProjectService.getSysProjectTotalCountUpdate(getUserId(),projectId,projectName,sysUserName);
+ int count = sysProjectService.getSysProjectTotalCountUpdate(getUserId(),projectNo,projectName,sysUserName);
this.setRowCount(count);
if (count > 0) {
- list = sysProjectService.getSysProjectListUpdate(first, pageSize,getUserId(),projectId,projectName,sysUserName);
+ list = sysProjectService.getSysProjectListUpdate(first, pageSize,getUserId(),projectNo,projectName,sysUserName);
}
+ selectedList = new ArrayList<>();
} catch (Exception e) {
logger.error(e);
}
@@ -246,17 +245,18 @@
@Override
public SysProject getRowData(String rowKey) {
- Iterator<SysProject> iterator = this.iterator();
- if (iterator != null) {
- SysProject br = null;
- while (iterator.hasNext()) {
- br = iterator.next();
- if (rowKey.equals(br.getId())) {
- return br;
- }
- }
- }
- return null;
+// Iterator<SysProject> iterator = this.iterator();
+// if (iterator != null) {
+// SysProject br = null;
+// while (iterator.hasNext()) {
+// br = iterator.next();
+// if (rowKey.equals(br.getId())) {
+// return br;
+// }
+// }
+// }
+ Long id=Long.valueOf(rowKey);
+ return sysProjectService.getSysProject(id);
}
};
}
@@ -305,11 +305,11 @@
this.sameDptUserList = sameDptUserList;
}
- public Map<String, String> getUserIdNameMap() {
+ public Map<Long, String> getUserIdNameMap() {
return userIdNameMap;
}
- public void setUserIdNameMap(Map<String, String> userIdNameMap) {
+ public void setUserIdNameMap(Map<Long, String> userIdNameMap) {
this.userIdNameMap = userIdNameMap;
}
}
--
Gitblit v1.9.2