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/service/SysProjectServiceImpl.java | 84 ++++++++++++++++++++++++++++++-----------
1 files changed, 61 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
index 033e838..09cb108 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
@@ -45,14 +45,19 @@
private SysUserService sysUserService;
@Override
- public SysProject getSysProject(String id) {
+ public SysProject getSysProject(Long id) {
return sysProjectDao.getSysProject(id);
}
@Override
- public SysProject getProjectByProId(String projectId) {
- return sysProjectDao.getProjectByProId(projectId);
+ public SysProject getProjectByProNo(String projectNo){
+ return sysProjectDao.getProjectByProNo(projectNo);
}
+
+// @Override
+// public SysProject getProjectByProNo(String projectNo) {
+// return sysProjectDao.getProjectByProNo(projectId);
+// }
@Override
public boolean isSysProjectExist(String projectName, Object o) {
@@ -70,7 +75,6 @@
@Override
public boolean insertSysProject(SysProject sysProject) {
- sysProject.setId(IDUtils.uuid());
sysProject.setValidFlag(1);
return sysProjectDao.insertSysProject(sysProject) > 0;
}
@@ -87,7 +91,7 @@
return false;
}
- List<String> ids = new ArrayList<String>();
+ List<Long> ids = new ArrayList<Long>();
for (SysProject sysReagent : selectedList) {
ids.add(sysReagent.getId());
}
@@ -113,18 +117,19 @@
}
@Override
- public int getSysProjectTotalCountUpdate(String createrUser,String projectId,String projectName,String sysUserName) {
+ public int getSysProjectTotalCountUpdate(Long createrUser,String projectNo,String projectName,String sysUserName) {
//Map<String, Object> params = new HashMap<>();
//String user="";
Map<String, Object> params = new HashMap<>();
- if (StringUtils.isNotBlank(createrUser)) {
+ if (createrUser!=null) {
SysUser sysUser = sysUserService.getSysUser(createrUser);
// 不是管理员时，加入applyUserId
- if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+ if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+ && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
params.put("createrUser", createrUser);
}
}
- params.put("projectId", projectId);
+ params.put("projectNo", projectNo);
if(StringUtils.isNotBlank(projectName)){
params.put("projectName","%"+ projectName+"%");
}
@@ -136,19 +141,20 @@
}
@Override
- public List<SysProject> getSysProjectListUpdate(int first, int pageSize,String createrUser,String projectId,String projectName,String sysUserName) {
+ public List<SysProject> getSysProjectListUpdate(int first, int pageSize,Long createrUser,String projectNo,String projectName,String sysUserName) {
Map<String, Object> params = new HashMap<>();
params.put("first", first);
params.put("pageSize", pageSize);
- if (StringUtils.isNotBlank(createrUser)) {
+ if (createrUser!=null) {
SysUser sysUser = sysUserService.getSysUser(createrUser);
// 不是管理员时，加入applyUserId
- if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+ if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+ && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
params.put("createrUser", createrUser);
}
}
- params.put("projectId", projectId);
+ params.put("projectNo", projectNo);
if(StringUtils.isNotBlank(projectName)){
params.put("projectName","%"+ projectName+"%");
}
@@ -163,16 +169,16 @@
@Transactional
public void importProject(FileUploadEvent event,SysUser currentUser) throws Exception {
- List<SysUser> userList = sysUserService.getSysUserList(null, null, null, null, null);
+ List<SysUser> userList = sysUserService.getSysUserList(null, null, null, null, null,null,null);
List<SysProject> sysProjectList = sysProjectDao.getSysProjectList(new HashMap());
- Map<String,String> userMap = new HashMap();
+ Map<String,Long> userMap = new HashMap();
Map<String,String> projectMap = new HashMap();
userList.forEach(user->{
userMap.put(user.getName(), user.getId());
});
sysProjectList.forEach(project->{
- projectMap.put(project.getProjectId(), project.getProjectId());
+ projectMap.put(project.getProjectNo(), project.getProjectNo());
});
UploadedFile file = event.getFile();
@@ -213,6 +219,10 @@
valuesList.add(cellInfo);
}
+ if (valuesList.size() != 4){
+ break;
+ }
+
if (userMap.get(valuesList.get(2)) == null) {
throw new Exception("课题负责人不存在");
}
@@ -223,15 +233,14 @@
}
SysProject sysProject = new SysProject();
- sysProject.setId(IDUtils.uuid());
sysProject.setCreaterUser(currentUser.getId());
- sysProject.setProjectId(valuesList.get(0));
+ sysProject.setProjectNo(valuesList.get(0));
sysProject.setProjectName(valuesList.get(1));
sysProject.setSysUserId(userMap.get(valuesList.get(2)));
sysProject.setRemark(valuesList.get(3));
sysProjects.add(sysProject);
//把excel里插入的更新Map
- projectMap.put(sysProject.getProjectId(), sysProject.getId());
+ projectMap.put(sysProject.getProjectNo(), sysProject.getProjectNo());//------------------&=***
}
if (sysProjects.size() > 0) {
@@ -245,6 +254,30 @@
}
@Override
+ public Boolean isExistProject(String project) {
+ return sysProjectDao.selectByProject(project) > 0;
+ }
+
+ @Override
+ public SysProject getProjectByName(String projectName) {
+ return sysProjectDao.getSysProjectByName(projectName);
+ }
+
+ @Override
+ public String getProjectNameById(Long projectId) {
+ SysProject project=this.sysProjectDao.getSysProject(projectId);
+ if(project!=null){
+ return project.getProjectName();
+ }
+ return "";
+ }
+
+ @Override
+ public List<SysProject> getProjectByIds(List<Long> ids) {
+ return this.sysProjectDao.getProjectByIds(ids);
+ }
+
+ @Override
public List<SysProject> getSysProjectList(int first, int pageSize) {
Map<String, Object> params = new HashMap<>();
params.put("first", first);
@@ -253,16 +286,21 @@
}
@Override
- public List<SysProject> getSysProjectList(String sysUserId) {
+ public List<SysProject> getSysProjectList(Long sysUserId) {
Map<String,Object> params=new HashMap<>();
params.put("sysUserId",sysUserId);
return sysProjectDao.getSysProjectList(params);
}
@Override
- public List<SysProject> getSysProjectListByProjectId(String projectId) {
+ public List<SysProject> getSysProjectListByProjectNo(String projectNo) {
Map<String,Object> params=new HashMap<>();
- params.put("projectId",projectId);
- return sysProjectDao.getSysProjectListByProjectId(params);
+ params.put("projectNo",projectNo);
+ return sysProjectDao.getSysProjectListByProjectNo(params);
}
+
+
+ public SysProject getSysProjectListByProjectId(Long id){
+ return sysProjectDao.getSysProjectListByProjectId(id);
+ }
}
--
Gitblit v1.9.2