Compare commits
No commits in common. "4b8dc5d6994c4a60ff7bc248d256d453be50582d" and "5b7daf58249d929ec0cbe8f421ab801d09f3ab86" have entirely different histories.
4b8dc5d699
...
5b7daf5824
@ -232,10 +232,6 @@ public class ProjectDAO {
|
|||||||
|
|
||||||
ProjectDO projectDO = projectMapper.getProjectById(projectId);
|
ProjectDO projectDO = projectMapper.getProjectById(projectId);
|
||||||
|
|
||||||
if (projectDO == null) {
|
|
||||||
return "项目负责人不存在";
|
|
||||||
}
|
|
||||||
|
|
||||||
UserDO userDO = userMapper.getUserById(projectDO.getPrincipalId());
|
UserDO userDO = userMapper.getUserById(projectDO.getPrincipalId());
|
||||||
|
|
||||||
if (userDO == null) {
|
if (userDO == null) {
|
||||||
|
@ -16,7 +16,6 @@ public class ProjectModuleSimpleVO {
|
|||||||
private Integer workLoad;
|
private Integer workLoad;
|
||||||
private Timestamp deadLine;
|
private Timestamp deadLine;
|
||||||
private String status;
|
private String status;
|
||||||
private Integer cycle;
|
|
||||||
private String principalUser;
|
private String principalUser;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,6 @@ import com.jsl.oa.dao.ProjectDAO;
|
|||||||
import com.jsl.oa.dao.ProjectDailyDAO;
|
import com.jsl.oa.dao.ProjectDailyDAO;
|
||||||
import com.jsl.oa.dao.UserDAO;
|
import com.jsl.oa.dao.UserDAO;
|
||||||
import com.jsl.oa.mapper.ProjectDailyMapper;
|
import com.jsl.oa.mapper.ProjectDailyMapper;
|
||||||
import com.jsl.oa.model.dodata.ProjectDO;
|
|
||||||
import com.jsl.oa.model.dodata.ProjectDailyDO;
|
import com.jsl.oa.model.dodata.ProjectDailyDO;
|
||||||
import com.jsl.oa.model.dodata.UserDO;
|
import com.jsl.oa.model.dodata.UserDO;
|
||||||
import com.jsl.oa.model.vodata.ProjectDailyAddVO;
|
import com.jsl.oa.model.vodata.ProjectDailyAddVO;
|
||||||
@ -211,12 +210,8 @@ public class ProjectDailyServiceImpl implements ProjectDailyService {
|
|||||||
// 复制相同的属性值
|
// 复制相同的属性值
|
||||||
Processing.copyProperties(projectDailyDO, projectDailyVO);
|
Processing.copyProperties(projectDailyDO, projectDailyVO);
|
||||||
// 赋值其他需查询的属性
|
// 赋值其他需查询的属性
|
||||||
ProjectDO projectDO = projectDAO.getProjectById(projectDailyVO.getProjectId());
|
projectDailyVO.setProjectName(
|
||||||
if (projectDO == null) {
|
projectDAO.getProjectById(projectDailyVO.getProjectId()).getName());
|
||||||
projectDailyVO.setProjectName(projectDO.getName());
|
|
||||||
} else {
|
|
||||||
projectDailyVO.setPrincipalName("项目不存在");
|
|
||||||
}
|
|
||||||
//设置发送者名称,如果为昵称为空则赋值用户账号
|
//设置发送者名称,如果为昵称为空则赋值用户账号
|
||||||
UserDO senderUser = userDAO.getUserById(projectDailyDO.getUserId());
|
UserDO senderUser = userDAO.getUserById(projectDailyDO.getUserId());
|
||||||
|
|
||||||
|
@ -346,14 +346,13 @@ 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("修改成功");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -370,13 +369,11 @@ 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()))
|
||||||
@ -392,11 +389,9 @@ 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);
|
||||||
@ -468,22 +463,17 @@ 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,7 +40,6 @@
|
|||||||
<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>
|
||||||
@ -106,7 +105,6 @@
|
|||||||
</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…
x
Reference in New Issue
Block a user