WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/develop'
All checks were successful
代码检查 / 代码检查 (push) Successful in 40s
Details

Browse Source
This commit is contained in:
筱锋xiao_lfeng 2024-04-22 19:32:19 +08:00
commit 203512797e
Signed by: XiaoLFeng
GPG Key ID: F693AA12AABBFA87
2 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
View File

@ -343,13 +343,14 @@ public class ProjectServiceImpl implements ProjectService {
if (projectModuleDO == null) {
return ResultUtil.error(ErrorCode.MODULE_NOT_EXIST);
}
HashMap<String, Object> descriptionMap = new HashMap<>();
descriptionMap.put("description", projectModuleEditVO.getDescription());
projectModuleEditVO.setDescription(gson.toJson(descriptionMap));
if (projectModuleEditVO.getDescription() != null) {
HashMap<String, Object> 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<String, Object> descriptionMap = new HashMap<>();
descriptionMap.put("description", projectChildAddVO.getDescription());
projectChildAddVO.setDescription(gson.toJson(descriptionMap));
if (projectChildAddVO.getDescription() != null) {
HashMap<String, Object> 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<String, Object> descriptionMap = new HashMap<>();
descriptionMap.put("description", projectEdit.getDescription());
projectEdit.setDescription(gson.toJson(descriptionMap));
if (projectEdit.getDescription() != null) {
HashMap<String, Object> descriptionMap = new HashMap<>();
descriptionMap.put("description", projectEdit.getDescription());
projectEdit.setDescription(gson.toJson(descriptionMap));
}
HashMap<String, Object> tagMap = new HashMap<>();
tagMap.put("tags", projectEdit.getTags().split(","));
projectEdit.setTags(gson.toJson(tagMap));
HashMap<String, Object> filesMap = new HashMap<>();
filesMap.put("URI", projectEdit.getFiles());
projectEdit.setFiles(gson.toJson(filesMap));
if (projectEdit.getDescription() != null) {
HashMap<String, Object> tagMap = new HashMap<>();
tagMap.put("tags", projectEdit.getTags().split(","));
projectEdit.setTags(gson.toJson(tagMap));
}
if (projectEdit.getDescription() != null) {
HashMap<String, Object> filesMap = new HashMap<>();
filesMap.put("URI", projectEdit.getFiles());
projectEdit.setFiles(gson.toJson(filesMap));
}
projectEdit.setId(projectId);
ProjectDO projectEdit1 = new ProjectDO();

2
src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml
View File

@ -40,6 +40,7 @@
<if test="isDelete != null">
is_delete = #{isDelete},
</if>
updated_at = CURRENT_TIMESTAMP
</set>
where id = #{id}
</update>
@ -105,6 +106,7 @@
</set>
where id = #{id}
</update>
<update id="projectChildEditAll">
update organize_oa.oa_project_child
<set>