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

feat：增加新业务功能获取我的审核 #13

Merged
XiaoLFeng merged 13 commits from feature-zrx into develop 2024-04-16 21:39:25 +08:00
Conversation 0 Commits 13 Files Changed 17 +8 -7
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cd65a5c6f8 - Show all commits

8
src/main/java/com/jsl/oa/model/vodata/ReviewVO.java
View File

@ -30,13 +30,13 @@ public class ReviewVO {
//申请的项目名称 //申请的项目名称
private String projectName; private String projectName;
//申请的子系统id //申请的子系统id
private Long projectSubsystemId; private Long projectChildId;
//申请的子系统名称 //申请的子系统名称
private String subsystemName; private String projectChildName;
//申请的子模块id //申请的子模块id
private Long projectSubmoduleId; private Long projectModuleId;
//申请的模块名称 //申请的模块名称
private String submoduleName; private String projectModuleName;
//申请时间 //申请时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date applicationTime; private Date applicationTime;

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

@ -353,7 +353,7 @@ public class ReviewServiceImpl implements ReviewService {
reviewVO.setCategory(Processing.turnReviewCategory(reviewDO.getCategory())) reviewVO.setCategory(Processing.turnReviewCategory(reviewDO.getCategory()))
.setSenderName(userMapper.getUserById(reviewDO.getSenderId()).getNickname()) .setSenderName(userMapper.getUserById(reviewDO.getSenderId()).getNickname())
.setProjectName(projectDAO.getProjectById(reviewDO.getProjectId()).getName()) .setProjectName(projectDAO.getProjectById(reviewDO.getProjectId()).getName())
.setSubsystemName(projectMapper.getProjectChildById( .setProjectChildName(projectMapper.getProjectChildById(
Math.toIntExact(reviewDO.getProjectChildId())).getName()) Math.toIntExact(reviewDO.getProjectChildId())).getName())
.setResult(Processing.turnReviewResult(reviewDO.getReviewResult())); .setResult(Processing.turnReviewResult(reviewDO.getReviewResult()));
// 赋值可为空属性并进行判断 // 赋值可为空属性并进行判断
@ -361,9 +361,10 @@ public class ReviewServiceImpl implements ReviewService {
reviewVO.setRecipientName(userMapper.getUserById(reviewDO.getRecipientId()).getNickname()); reviewVO.setRecipientName(userMapper.getUserById(reviewDO.getRecipientId()).getNickname());
} }
if (reviewDO.getProjectModuleId() != null) { if (reviewDO.getProjectModuleId() != null) {
reviewVO.setSubmoduleName(reviewDAO.getNameByModule(Math.toIntExact(reviewDO.getProjectModuleId()))); reviewVO.setProjectModuleName(
reviewDAO.getNameByModule(Math.toIntExact(reviewDO.getProjectModuleId())));
} else { } else {
reviewVO.setSubmoduleName("无"); reviewVO.setProjectModuleName("无");
} }
// 将封装好的结果添加到结果集 // 将封装好的结果添加到结果集
resultData.add(reviewVO); resultData.add(reviewVO);