xh/kehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.将管理员的id改为人事id

Browse Source 
2.新增周报时,自动获取项目编号
This commit is contained in:
chen 2024-08-05 15:37:28 +08:00
parent 28a8756f83
commit 1c5a3595da
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
View File

@ -161,8 +161,13 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
//获取projectManagerData //获取projectManagerData
JSONArray projectManagerData = extInfo.getJSONArray("projectManagerData"); JSONArray projectManagerData = extInfo.getJSONArray("projectManagerData");
JSONArray projectAdmin = extInfo.getJSONArray("projectAdmin"); JSONArray projectAdmin = extInfo.getJSONArray("projectAdmin");
// 将projectAdmin改为人事id
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
userLoginEntityWrapper.eq("id_", projectAdmin.getString(projectAdmin.toArray().length -1 ));
SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
ext.put("projectManagerData",projectManagerData.getString(projectManagerData.toArray().length -1 )); ext.put("projectManagerData",projectManagerData.getString(projectManagerData.toArray().length -1 ));
ext.put("projectAdmin",projectAdmin.getString(projectAdmin.toArray().length -1 )); ext.put("projectAdmin",systemUserLogin.getUserinfoId());
ext.put("draftManId",extInfo.getString("draftManId")); ext.put("draftManId",extInfo.getString("draftManId"));
return ext; return ext;
} }
@ -270,20 +275,17 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
// 根据编号,名称查询是否存在 // 根据编号,名称查询是否存在
for (ProjectWeeklyList list : membersList) { for (ProjectWeeklyList list : membersList) {
String projectName = list.getProjectName(); String projectName = list.getProjectName();
String projectNo = list.getProjectNo();
EntityWrapper<ProjectInfo> wrapper = new EntityWrapper<>(); EntityWrapper<ProjectInfo> wrapper = new EntityWrapper<>();
if (!StringUtils.isEmpty(projectNo)) wrapper.eq("project_no", projectNo);
if (!StringUtils.isEmpty(projectName)) wrapper.eq("project_name", projectName); if (!StringUtils.isEmpty(projectName)) wrapper.eq("project_name", projectName);
wrapper.eq("is_deleted", false); wrapper.eq("is_deleted", false);
wrapper.eq("project_category", "init"); wrapper.eq("project_category", "init");
ProjectInfo project = projectInfoService.selectOne(wrapper); ProjectInfo project = projectInfoService.selectOne(wrapper);
if (ObjectUtils.isEmpty(project)) return ApiResponse.fillFail("你输入的项目编号/名称不存在！"); if (ObjectUtils.isEmpty(project)) return ApiResponse.fillFail("你输入的项目名称不存在！");
ProjectWeekly projectWeekly = new ProjectWeekly(); ProjectWeekly projectWeekly = new ProjectWeekly();
projectWeekly.setProjectId(String.valueOf(project.getId())); projectWeekly.setProjectId(String.valueOf(project.getId()));
//将项目专员和项目负责人id 存入Weekly中 //将项目专员和项目负责人id 存入Weekly中
JSONObject ext = getExt(project,projectInfoReq); JSONObject ext = getExt(project,projectInfoReq);
ext.put("projectNo",projectNo);
ext.put("projectName",projectName); ext.put("projectName",projectName);
projectWeekly.setExt(ext); projectWeekly.setExt(ext);