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

Compare commits

base: WxxyDeveloper:7163427c4c55d16867fda291f534f612c11dc1d0
Branches Tags
WxxyDeveloper:master
WxxyDeveloper:develop
WxxyDeveloper:feature-zrx
WxxyDeveloper:feature-jie
WxxyDeveloper:feature-xiaolfeng
..
compare: WxxyDeveloper:ca68b6566b2208dd5a427cc9824fb2355393ecf2
Branches Tags
WxxyDeveloper:master
WxxyDeveloper:develop
WxxyDeveloper:feature-zrx
WxxyDeveloper:feature-jie
WxxyDeveloper:feature-xiaolfeng

No commits in common. "7163427c4c55d16867fda291f534f612c11dc1d0" and "ca68b6566b2208dd5a427cc9824fb2355393ecf2" have entirely different histories.
7163427c4c ... ca68b6566b

2 changed files with 6 additions and 11 deletions
Show Stats Expand all files Collapse all files

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

@ -28,13 +28,13 @@ public class ProjectDailyVO {
private String content;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT")
private Date dailyTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT")
private Date createdAt;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT")
private Date updatedAt;
private Boolean isAllowDelete;

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

@ -178,7 +178,7 @@ public class ReviewServiceImpl implements ReviewService {
//获取用户
Integer userId = Math.toIntExact(Processing.getAuthHeaderToUserId(request));
//检查对应项目，子系统，子模块是否存在 用变量接收
//检查对应项目，子系统，子模块是否存在
if (projectMapper.getNotDeleteProjectById(Long.valueOf(reviewAddVO.getProjectId())) == null) {
return ResultUtil.error(ErrorCode.PROJECT_NOT_EXIST);
}
@ -266,15 +266,10 @@ public class ReviewServiceImpl implements ReviewService {
reviewDO.setRecipientId(userId);
reviewDO.setReviewResult(reviewUpdateResultVO.getResult());
Integer moduleId = null;
if (reviewDO.getProjectModuleId() != null) {
moduleId = Math.toIntExact(reviewDO.getProjectModuleId());
}
//发送消息
messageService.messageAdd(Math.toIntExact(reviewDO.getProjectId()),
Math.toIntExact(reviewDO.getProjectChildId()),
moduleId,
Math.toIntExact(reviewDO.getProjectModuleId()),
Long.valueOf(reviewDO.getSenderId()),
Long.valueOf(reviewUpdateResultVO.getResult()),
request);
@ -403,7 +398,7 @@ public class ReviewServiceImpl implements ReviewService {
if (projectChildDO != null) {
reviewVO.setProjectChildName(projectChildDO.getName());
} else {
reviewVO.setProjectChildName("未找到子系统");
reviewVO.setProjectChildName(projectChildDO.getName());
}
// 设置结果、发送者id，接受者id
reviewVO.setResult(Processing.turnReviewResult(reviewDO.getReviewResult()))