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

feature-zrx #32

Merged
XiaoLFeng merged 12 commits from feature-zrx into develop 2024-04-19 22:41:30 +08:00
Conversation 0 Commits 12 Files Changed 19 +12 -2
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9ab6d1621b - Show all commits

1
src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java
View File

@ -32,6 +32,7 @@ public class ProjectDailyVO {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updatedAt;
private Boolean isAllowDelete;
}

8
src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java
View File

@ -197,6 +197,14 @@ public class ProjectDailyServiceImpl implements ProjectDailyService {
projectDailyVO.setProjectName(
projectDAO.getProjectById(projectDailyVO.getProjectId()).getName())
.setUserName(userDAO.getUserById(projectDailyDO.getUserId()).getNickname());
//用户是否有权限删除
if (projectDailyDO.getUserId().equals(projectDAO.
getProjectById(projectDailyVO.getProjectId()).getPrincipalId())) {
projectDailyVO.setIsAllowDelete(true);
} else {
projectDailyVO.setIsAllowDelete(false);
}
// 向 结果封装类数组 添加对应 日报封装类
projectDailyVOS.add(projectDailyVO);
}

5
src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java
View File

@ -281,7 +281,6 @@ public class ReviewServiceImpl implements ReviewService {
Integer page,
Integer pageSize) {
// 获取审核记录数据
List<ReviewVO> reviewVOS = getReviewsByResult(request, statue);
@ -355,7 +354,9 @@ public class ReviewServiceImpl implements ReviewService {
.setProjectName(projectDAO.getProjectById(reviewDO.getProjectId()).getName())
.setProjectChildName(projectMapper.getProjectChildById(
Math.toIntExact(reviewDO.getProjectChildId())).getName())
.setResult(Processing.turnReviewResult(reviewDO.getReviewResult()));
.setResult(Processing.turnReviewResult(reviewDO.getReviewResult()))
.setSenderId(Long.valueOf(reviewDO.getSenderId()))
.setRecipientId(reviewDO.getRecipientId());
// 赋值可为空属性并进行判断
if (reviewDO.getRecipientId() != null) {
reviewVO.setRecipientName(userMapper.getUserById(reviewDO.getRecipientId()).getNickname());