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

fix:初步重构 #14

Merged
XiaoLFeng merged 3 commits from feature-jie into develop 2024-04-14 14:55:42 +08:00
Conversation 1 Commits 3 Files Changed 20 +2 -4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aa9efbcc8b - Show all commits

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

@ -10,7 +10,6 @@ import lombok.experimental.Accessors;
public class ProjectSimpleVO {
private String name;
private String principalUser;
private Integer isFinish;
private String description;
private Long cycle;
private Long workLoad;

5
src/main/java/com/jsl/oa/utils/Processing.java
View File

@ -356,9 +356,8 @@ public class Processing {
projectSimpleVO.setId(projectDO.getId());
projectSimpleVO.setName(projectDO.getName());
projectSimpleVO.setTags(projectDO.getTags());
projectSimpleVO.setCycle(projectDO.getCycle());
projectSimpleVO.setIsFinish(projectDO.getIsFinish());
projectSimpleVO.setWorkLoad(projectDO.getWorkLoad());
projectSimpleVO.setCycle(Long.valueOf(projectDO.getCycle()));
projectSimpleVO.setWorkLoad(Long.valueOf(projectDO.getWorkLoad()));
projectSimpleVO.setPrincipalUser(userDAO.getUserById(projectDO.getPrincipalId()).getUsername());
// 解析JSON字符串
JsonNode rootNode = null;