bug:指定负责人判空 #44
|
@ -343,13 +343,14 @@ public class ProjectServiceImpl implements ProjectService {
|
||||||
if (projectModuleDO == null) {
|
if (projectModuleDO == null) {
|
||||||
return ResultUtil.error(ErrorCode.MODULE_NOT_EXIST);
|
return ResultUtil.error(ErrorCode.MODULE_NOT_EXIST);
|
||||||
}
|
}
|
||||||
|
if (projectModuleEditVO.getDescription() != null) {
|
||||||
HashMap<String, Object> descriptionMap = new HashMap<>();
|
HashMap<String, Object> descriptionMap = new HashMap<>();
|
||||||
descriptionMap.put("description", projectModuleEditVO.getDescription());
|
descriptionMap.put("description", projectModuleEditVO.getDescription());
|
||||||
projectModuleEditVO.setDescription(gson.toJson(descriptionMap));
|
projectModuleEditVO.setDescription(gson.toJson(descriptionMap));
|
||||||
|
}
|
||||||
projectModuleEditVO.setId(id);
|
projectModuleEditVO.setId(id);
|
||||||
projectMapper.projectModuleEdit(projectModuleEditVO);
|
projectMapper.projectModuleEdit(projectModuleEditVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
return ResultUtil.success("修改成功");
|
return ResultUtil.success("修改成功");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -366,11 +367,13 @@ public class ProjectServiceImpl implements ProjectService {
|
||||||
JsonObject jsonObject = gson
|
JsonObject jsonObject = gson
|
||||||
.fromJson(projectChildDO.getDescription(), JsonObject.class);
|
.fromJson(projectChildDO.getDescription(), JsonObject.class);
|
||||||
//改动简介发送消息
|
//改动简介发送消息
|
||||||
|
if (projectChildAddVO.getDescription() != null) {
|
||||||
if (!Objects.equals(projectChildAddVO.getDescription(), "")
|
if (!Objects.equals(projectChildAddVO.getDescription(), "")
|
||||||
&& !projectChildAddVO.getDescription()
|
&& !projectChildAddVO.getDescription()
|
||||||
.equals(jsonObject.get("description").getAsString())) {
|
.equals(jsonObject.get("description").getAsString())) {
|
||||||
messageService.messageAdd(projectMapper.getProjectIdBySysId(id)
|
messageService.messageAdd(projectMapper.getProjectIdBySysId(id)
|
||||||
.intValue(), id.intValue(), null, 2, request);
|
.intValue(), id.intValue(), null, 2, request);
|
||||||
|
}
|
||||||
} // 改动周期或工作量发送消息
|
} // 改动周期或工作量发送消息
|
||||||
if ((projectChildAddVO.getCycle() != null
|
if ((projectChildAddVO.getCycle() != null
|
||||||
&& projectChildDO.getCycle().equals(projectChildAddVO.getCycle()))
|
&& projectChildDO.getCycle().equals(projectChildAddVO.getCycle()))
|
||||||
|
@ -386,9 +389,11 @@ public class ProjectServiceImpl implements ProjectService {
|
||||||
messageService.messageAdd(projectMapper.getProjectIdBySysId(id)
|
messageService.messageAdd(projectMapper.getProjectIdBySysId(id)
|
||||||
.intValue(), 3, id.intValue(), request);
|
.intValue(), 3, id.intValue(), request);
|
||||||
}
|
}
|
||||||
|
if (projectChildAddVO.getDescription() != null) {
|
||||||
HashMap<String, Object> descriptionMap = new HashMap<>();
|
HashMap<String, Object> descriptionMap = new HashMap<>();
|
||||||
descriptionMap.put("description", projectChildAddVO.getDescription());
|
descriptionMap.put("description", projectChildAddVO.getDescription());
|
||||||
projectChildAddVO.setDescription(gson.toJson(descriptionMap));
|
projectChildAddVO.setDescription(gson.toJson(descriptionMap));
|
||||||
|
}
|
||||||
|
|
||||||
projectChildAddVO.setId(id);
|
projectChildAddVO.setId(id);
|
||||||
projectMapper.projectChildEditAll(projectChildAddVO);
|
projectMapper.projectChildEditAll(projectChildAddVO);
|
||||||
|
@ -460,17 +465,22 @@ public class ProjectServiceImpl implements ProjectService {
|
||||||
if (projectEdit.getStatus() != null && !projectDO.getStatus().equals(projectEdit.getStatus())) {
|
if (projectEdit.getStatus() != null && !projectDO.getStatus().equals(projectEdit.getStatus())) {
|
||||||
messageService.messageAdd(projectId.intValue(), 2, null, request);
|
messageService.messageAdd(projectId.intValue(), 2, null, request);
|
||||||
}
|
}
|
||||||
|
if (projectEdit.getDescription() != null) {
|
||||||
HashMap<String, Object> descriptionMap = new HashMap<>();
|
HashMap<String, Object> descriptionMap = new HashMap<>();
|
||||||
descriptionMap.put("description", projectEdit.getDescription());
|
descriptionMap.put("description", projectEdit.getDescription());
|
||||||
projectEdit.setDescription(gson.toJson(descriptionMap));
|
projectEdit.setDescription(gson.toJson(descriptionMap));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (projectEdit.getDescription() != null) {
|
||||||
HashMap<String, Object> tagMap = new HashMap<>();
|
HashMap<String, Object> tagMap = new HashMap<>();
|
||||||
tagMap.put("tags", projectEdit.getTags().split(","));
|
tagMap.put("tags", projectEdit.getTags().split(","));
|
||||||
projectEdit.setTags(gson.toJson(tagMap));
|
projectEdit.setTags(gson.toJson(tagMap));
|
||||||
|
}
|
||||||
|
if (projectEdit.getDescription() != null) {
|
||||||
HashMap<String, Object> filesMap = new HashMap<>();
|
HashMap<String, Object> filesMap = new HashMap<>();
|
||||||
filesMap.put("URI", projectEdit.getFiles());
|
filesMap.put("URI", projectEdit.getFiles());
|
||||||
projectEdit.setFiles(gson.toJson(filesMap));
|
projectEdit.setFiles(gson.toJson(filesMap));
|
||||||
|
}
|
||||||
|
|
||||||
projectEdit.setId(projectId);
|
projectEdit.setId(projectId);
|
||||||
ProjectDO projectEdit1 = new ProjectDO();
|
ProjectDO projectEdit1 = new ProjectDO();
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
<if test="isDelete != null">
|
<if test="isDelete != null">
|
||||||
is_delete = #{isDelete},
|
is_delete = #{isDelete},
|
||||||
</if>
|
</if>
|
||||||
|
updated_at = CURRENT_TIMESTAMP
|
||||||
</set>
|
</set>
|
||||||
where id = #{id}
|
where id = #{id}
|
||||||
</update>
|
</update>
|
||||||
|
@ -105,6 +106,7 @@
|
||||||
</set>
|
</set>
|
||||||
where id = #{id}
|
where id = #{id}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
<update id="projectChildEditAll">
|
<update id="projectChildEditAll">
|
||||||
update organize_oa.oa_project_child
|
update organize_oa.oa_project_child
|
||||||
<set>
|
<set>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user