diff --git a/src/main/java/com/jsl/oa/model/vodata/ReviewVO.java b/src/main/java/com/jsl/oa/model/vodata/ReviewVO.java index a62beaf..9177701 100644 --- a/src/main/java/com/jsl/oa/model/vodata/ReviewVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/ReviewVO.java @@ -30,13 +30,13 @@ public class ReviewVO { //申请的项目名称 private String projectName; //申请的子系统id - private Long projectSubsystemId; + private Long projectChildId; //申请的子系统名称 - private String subsystemName; + private String projectChildName; //申请的子模块id - private Long projectSubmoduleId; + private Long projectModuleId; //申请的模块名称 - private String submoduleName; + private String projectModuleName; //申请时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date applicationTime; diff --git a/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java index ed22c1c..5336f74 100644 --- a/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java @@ -353,7 +353,7 @@ public class ReviewServiceImpl implements ReviewService { reviewVO.setCategory(Processing.turnReviewCategory(reviewDO.getCategory())) .setSenderName(userMapper.getUserById(reviewDO.getSenderId()).getNickname()) .setProjectName(projectDAO.getProjectById(reviewDO.getProjectId()).getName()) - .setSubsystemName(projectMapper.getProjectChildById( + .setProjectChildName(projectMapper.getProjectChildById( Math.toIntExact(reviewDO.getProjectChildId())).getName()) .setResult(Processing.turnReviewResult(reviewDO.getReviewResult())); // 赋值可为空属性并进行判断 @@ -361,9 +361,10 @@ public class ReviewServiceImpl implements ReviewService { reviewVO.setRecipientName(userMapper.getUserById(reviewDO.getRecipientId()).getNickname()); } if (reviewDO.getProjectModuleId() != null) { - reviewVO.setSubmoduleName(reviewDAO.getNameByModule(Math.toIntExact(reviewDO.getProjectModuleId()))); + reviewVO.setProjectModuleName( + reviewDAO.getNameByModule(Math.toIntExact(reviewDO.getProjectModuleId()))); } else { - reviewVO.setSubmoduleName("无"); + reviewVO.setProjectModuleName("无"); } // 将封装好的结果添加到结果集 resultData.add(reviewVO);