From dca7d3c277523d237f23b1027b6991ac89ed4965 Mon Sep 17 00:00:00 2001 From: 176yunxuan <362612387@qq.com~> Date: Sat, 20 Apr 2024 16:07:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=AE=8C=E5=96=84=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jsl/oa/dao/ProjectDAO.java | 3 -- .../oa/services/impl/MessageServiceImpl.java | 5 +++- .../oa/services/impl/ProjectServiceImpl.java | 30 +++++++++++++++---- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/jsl/oa/dao/ProjectDAO.java b/src/main/java/com/jsl/oa/dao/ProjectDAO.java index 1e7491e..74e029c 100644 --- a/src/main/java/com/jsl/oa/dao/ProjectDAO.java +++ b/src/main/java/com/jsl/oa/dao/ProjectDAO.java @@ -182,9 +182,6 @@ public class ProjectDAO { return projectMapper.getAllProject(); } - public ProjectModuleDO getProjectWorkerById(Long id) { - return projectMapper.getProjectWorkById(id); - } public List getProjectByPrincipalUser(Long uid) { log.info("\t> 执行 DAO 层 ProjectDAO.getProjectFromUser 方法"); diff --git a/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java index 41377ca..14e57e2 100644 --- a/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java @@ -188,7 +188,10 @@ public class MessageServiceImpl implements MessageService { // 获取项目名,负责人名 String projectName = projectMapper.tgetProjectById(pId).getName(); String senderName = userDAO.getUserById(Processing.getAuthHeaderToUserId(request)).getUsername(); - String systemName = projectMapper.getWorkById(systemId).getName(); + String systemName = null; + if (systemId != null) { + systemName = projectMapper.getWorkById(systemId).getName(); + } // 添加消息 // 1:上传文档 2:修改状态 3:修改负责人 List uidList = projectMapper.getMemberByProjectId(pId); diff --git a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java index 58f1cc6..e4ddbb9 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java @@ -327,6 +327,10 @@ public class ProjectServiceImpl implements ProjectService { projectMapper.getPirIdbyId(projectMapper.getModuleById(id.intValue()).getProjectChildId()))) { return ResultUtil.error(ErrorCode.NOT_PERMISSION); } else { + ProjectModuleDO projectModuleDO = projectMapper.getModuleById(id.intValue()); + if (projectModuleDO == null) { + return ResultUtil.error(ErrorCode.MODULE_NOT_EXIST); + } HashMap descriptionMap = new HashMap<>(); descriptionMap.put("description", projectModuleEditVO.getDescription()); projectModuleEditVO.setDescription(gson.toJson(descriptionMap)); @@ -334,7 +338,6 @@ public class ProjectServiceImpl implements ProjectService { projectMapper.projectModuleEdit(projectModuleEditVO); } - return ResultUtil.success("修改成功"); } @@ -344,8 +347,12 @@ public class ProjectServiceImpl implements ProjectService { if (!Objects.equals(Processing.getAuthHeaderToUserId(request), projectMapper.getPirIdbyId(id))) { return ResultUtil.error(ErrorCode.NOT_PERMISSION); } else { + ProjectChildDO projectChildDO = projectMapper.getProjectChildById(id.intValue()); + if (projectChildDO == null) { + return ResultUtil.error(ErrorCode.PROJECT_CHILD_NOT_EXIST); + } JsonObject jsonObject = gson - .fromJson(projectMapper.getProjectChildById(id.intValue()).getDescription(), JsonObject.class); + .fromJson(projectChildDO.getDescription(), JsonObject.class); //改动简介发送消息 if (!Objects.equals(projectChildAddVO.getDescription(), "") && !projectChildAddVO.getDescription() @@ -353,11 +360,20 @@ public class ProjectServiceImpl implements ProjectService { messageService.messageAdd(projectMapper.getProjectIdBySysId(id) .intValue(), id.intValue(), null, 2, request); } // 改动周期或工作量发送消息 - if (projectChildAddVO.getCycle() != null || projectChildAddVO.getWorkLoad() != null) { + if ((projectChildAddVO.getCycle() != null + && projectChildDO.getCycle().equals(projectChildAddVO.getCycle())) + || (projectChildAddVO.getWorkLoad() != null + && projectChildDO.getWorkLoad().equals(projectChildAddVO.getWorkLoad())) + ) { messageService.messageAdd(projectMapper.getProjectIdBySysId(id) .intValue(), id.intValue(), null, 3, request); + } //改动负责人发送消息 + if (projectChildAddVO.getPrincipalId() != null + && !Objects.equals(projectChildAddVO.getPrincipalId(), + projectChildDO.getPrincipalId())) { + messageService.messageAdd(projectMapper.getProjectIdBySysId(id) + .intValue(), 3, id.intValue(), request); } - HashMap descriptionMap = new HashMap<>(); descriptionMap.put("description", projectChildAddVO.getDescription()); projectChildAddVO.setDescription(gson.toJson(descriptionMap)); @@ -366,7 +382,6 @@ public class ProjectServiceImpl implements ProjectService { projectMapper.projectChildEditAll(projectChildAddVO); } - return ResultUtil.success("修改成功"); } @@ -428,6 +443,11 @@ public class ProjectServiceImpl implements ProjectService { //判断项目是否存在 if (projectDAO.isExistProject(projectId)) { //更新数据 + ProjectDO projectDO = projectDAO.getProjectById(projectId); + //改变项目状态发送消息 + if (projectEdit.getStatus() != null && !projectDO.getStatus().equals(projectEdit.getStatus())) { + messageService.messageAdd(projectId.intValue(), 2, null, request); + } HashMap descriptionMap = new HashMap<>(); descriptionMap.put("description", projectEdit.getDescription()); projectEdit.setDescription(gson.toJson(descriptionMap)); From abef74af38e48293faa518c11aafa57650240b2e Mon Sep 17 00:00:00 2001 From: 176yunxuan <362612387@qq.com~> Date: Sat, 20 Apr 2024 19:53:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E5=AE=8C=E5=96=84=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsl/oa/services/impl/MessageServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java index 14e57e2..5839cbb 100644 --- a/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java @@ -189,7 +189,7 @@ public class MessageServiceImpl implements MessageService { String projectName = projectMapper.tgetProjectById(pId).getName(); String senderName = userDAO.getUserById(Processing.getAuthHeaderToUserId(request)).getUsername(); String systemName = null; - if (systemId != null) { + if (systemId != null && projectMapper.getWorkById(systemId) != null) { systemName = projectMapper.getWorkById(systemId).getName(); } // 添加消息 @@ -241,7 +241,7 @@ public class MessageServiceImpl implements MessageService { String senderName = userDAO.getUserById(Processing.getAuthHeaderToUserId(request)).getUsername(); String systemName = projectMapper.getWorkById(systmeId).getName(); String moddleName = null; - if (moddleId != null) { + if (moddleId != null && projectMapper.getModuleById(moddleId) != null) { moddleName = projectMapper.getModuleById(moddleId).getName(); } // 添加消息