From aa9efbcc8b329a15ba4d5b0edc89e8f322173d50 Mon Sep 17 00:00:00 2001
From: XiaoLFeng <gm@x-lf.cn>
Date: Sun, 14 Apr 2024 14:54:46 +0800
Subject: [PATCH] =?UTF-8?q?patch:=20=E8=A1=A5=E4=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/jsl/oa/model/vodata/ProjectSimpleVO.java | 1 -
 src/main/java/com/jsl/oa/utils/Processing.java             | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/jsl/oa/model/vodata/ProjectSimpleVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectSimpleVO.java
index de5ba6c..f2d9d88 100644
--- a/src/main/java/com/jsl/oa/model/vodata/ProjectSimpleVO.java
+++ b/src/main/java/com/jsl/oa/model/vodata/ProjectSimpleVO.java
@@ -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;
diff --git a/src/main/java/com/jsl/oa/utils/Processing.java b/src/main/java/com/jsl/oa/utils/Processing.java
index ab81654..19941ea 100755
--- a/src/main/java/com/jsl/oa/utils/Processing.java
+++ b/src/main/java/com/jsl/oa/utils/Processing.java
@@ -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;