From 998f6a683e0e6a6137411a0a88663d3344f4abb4 Mon Sep 17 00:00:00 2001 From: 176yunxuan <362612387@qq.com~> Date: Sun, 21 Apr 2024 21:31:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bug:=E5=AD=90=E6=A8=A1=E5=9D=97=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=A2=9E=E5=8A=A0=E5=91=A8=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jsl/oa/model/vodata/ProjectModuleSimpleVO.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/jsl/oa/model/vodata/ProjectModuleSimpleVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectModuleSimpleVO.java index 0871346..c14c2ec 100644 --- a/src/main/java/com/jsl/oa/model/vodata/ProjectModuleSimpleVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/ProjectModuleSimpleVO.java @@ -16,6 +16,7 @@ public class ProjectModuleSimpleVO { private Integer workLoad; private Timestamp deadLine; private String status; + private Integer cycle; private String principalUser; } From 22e79558da8db6716b9f19908ebf7eb10cad8cd6 Mon Sep 17 00:00:00 2001 From: 176yunxuan <362612387@qq.com~> Date: Mon, 22 Apr 2024 19:29:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug:=E6=8C=87=E5=AE=9A=E8=B4=9F=E8=B4=A3?= =?UTF-8?q?=E4=BA=BA=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/services/impl/ProjectServiceImpl.java | 54 +++++++++++-------- .../com/jsl/oa/mapper/ProjectMapper.xml | 2 + 2 files changed, 34 insertions(+), 22 deletions(-) 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 acdc889..fbcc26d 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java @@ -343,13 +343,14 @@ public class ProjectServiceImpl implements ProjectService { if (projectModuleDO == null) { return ResultUtil.error(ErrorCode.MODULE_NOT_EXIST); } - HashMap descriptionMap = new HashMap<>(); - descriptionMap.put("description", projectModuleEditVO.getDescription()); - projectModuleEditVO.setDescription(gson.toJson(descriptionMap)); + if (projectModuleEditVO.getDescription() != null) { + HashMap descriptionMap = new HashMap<>(); + descriptionMap.put("description", projectModuleEditVO.getDescription()); + projectModuleEditVO.setDescription(gson.toJson(descriptionMap)); + } projectModuleEditVO.setId(id); projectMapper.projectModuleEdit(projectModuleEditVO); } - return ResultUtil.success("修改成功"); } @@ -366,11 +367,13 @@ public class ProjectServiceImpl implements ProjectService { JsonObject jsonObject = gson .fromJson(projectChildDO.getDescription(), JsonObject.class); //改动简介发送消息 - if (!Objects.equals(projectChildAddVO.getDescription(), "") - && !projectChildAddVO.getDescription() - .equals(jsonObject.get("description").getAsString())) { - messageService.messageAdd(projectMapper.getProjectIdBySysId(id) - .intValue(), id.intValue(), null, 2, request); + if (projectChildAddVO.getDescription() != null) { + if (!Objects.equals(projectChildAddVO.getDescription(), "") + && !projectChildAddVO.getDescription() + .equals(jsonObject.get("description").getAsString())) { + messageService.messageAdd(projectMapper.getProjectIdBySysId(id) + .intValue(), id.intValue(), null, 2, request); + } } // 改动周期或工作量发送消息 if ((projectChildAddVO.getCycle() != null && projectChildDO.getCycle().equals(projectChildAddVO.getCycle())) @@ -386,9 +389,11 @@ public class ProjectServiceImpl implements ProjectService { messageService.messageAdd(projectMapper.getProjectIdBySysId(id) .intValue(), 3, id.intValue(), request); } - HashMap descriptionMap = new HashMap<>(); - descriptionMap.put("description", projectChildAddVO.getDescription()); - projectChildAddVO.setDescription(gson.toJson(descriptionMap)); + if (projectChildAddVO.getDescription() != null) { + HashMap descriptionMap = new HashMap<>(); + descriptionMap.put("description", projectChildAddVO.getDescription()); + projectChildAddVO.setDescription(gson.toJson(descriptionMap)); + } projectChildAddVO.setId(id); projectMapper.projectChildEditAll(projectChildAddVO); @@ -460,17 +465,22 @@ public class ProjectServiceImpl implements ProjectService { 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)); + if (projectEdit.getDescription() != null) { + HashMap descriptionMap = new HashMap<>(); + descriptionMap.put("description", projectEdit.getDescription()); + projectEdit.setDescription(gson.toJson(descriptionMap)); + } - HashMap tagMap = new HashMap<>(); - tagMap.put("tags", projectEdit.getTags().split(",")); - projectEdit.setTags(gson.toJson(tagMap)); - - HashMap filesMap = new HashMap<>(); - filesMap.put("URI", projectEdit.getFiles()); - projectEdit.setFiles(gson.toJson(filesMap)); + if (projectEdit.getDescription() != null) { + HashMap tagMap = new HashMap<>(); + tagMap.put("tags", projectEdit.getTags().split(",")); + projectEdit.setTags(gson.toJson(tagMap)); + } + if (projectEdit.getDescription() != null) { + HashMap filesMap = new HashMap<>(); + filesMap.put("URI", projectEdit.getFiles()); + projectEdit.setFiles(gson.toJson(filesMap)); + } projectEdit.setId(projectId); ProjectDO projectEdit1 = new ProjectDO(); diff --git a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml index 5d5a2b5..df59060 100644 --- a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml +++ b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml @@ -40,6 +40,7 @@ is_delete = #{isDelete}, + updated_at = CURRENT_TIMESTAMP where id = #{id} @@ -105,6 +106,7 @@ where id = #{id} + update organize_oa.oa_project_child