查询bug

src/main/java/com/jsl/oa/dao/ProjectDAO.java

@@ -46,6 +46,7 @@ public class ProjectDAO {
         log.info("\t\t> 从 MySQL 更新数据");
         ProjectDO projectDO = new ProjectDO();
         Processing.copyProperties(projectEdit,projectDO);
+        projectDO.setId(projectId);
         projectMapper.projectEdit(projectDO);
         log.info("\t\t> 从 MySQL 获取数据");
         return projectMapper.getProjectById(projectId);

src/main/java/com/jsl/oa/mapper/ProjectMapper.java

@@ -5,6 +5,7 @@ import com.jsl.oa.model.doData.ProjectDO;
 import com.jsl.oa.model.doData.ProjectUserDO;
 import com.jsl.oa.model.doData.ProjectWorkDO;
 import com.jsl.oa.model.voData.ProjectInfoVO;
+import com.jsl.oa.model.voData.ProjectWorkSimpleVO;
 import com.jsl.oa.model.voData.ProjectWorkVO;
 import org.apache.ibatis.annotations.*;
 
@@ -109,7 +110,10 @@ public interface ProjectMapper {
     List<ProjectDO> tgetBytags(List<String> tags,List<Integer> isFinish);
 
    @Select("select * from organize_oa.oa_project_work where id=#{id}")
-   ProjectWorkDO getWorkById(Integer id);
+   ProjectWorkSimpleVO getWorkById(Integer id);
 @Select("select principal_id from organize_oa.oa_project_work where id=#{pid}")
     Long getPirIdbyWorkid(Long pid);
+
+    @Select("select principal_id from organize_oa.oa_project_work where id=#{id}")
+    Long getPid(Integer id);
 }

src/main/java/com/jsl/oa/model/doData/ProjectDO.java

@@ -30,7 +30,7 @@ public class ProjectDO {
     private Integer isDelete;
     private Integer isFinish;
     private Long workLoad;
-    private boolean status;
+    private Integer status;
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "UTC")
     private Timestamp beginTime;
 

src/main/java/com/jsl/oa/model/voData/ProjectEditVO.java

@@ -19,7 +19,8 @@ public class ProjectEditVO {
     private String file;
     private String description;
     private Integer isFinish;
-    private boolean status;
+    private Integer status;
+    private Long workLoad;
     private Timestamp beginTime;
     private Timestamp completeTime;
     private Timestamp deadline;

src/main/java/com/jsl/oa/model/voData/ProjectWorkSimpleVO.java

@@ -0,0 +1,24 @@
+package com.jsl.oa.model.voData;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.sql.Timestamp;
+
+@Data
+@Accessors(chain = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ProjectWorkSimpleVO {
+    private String name;
+    private String principalUser;
+    private Integer isFinish;
+    private String description;
+    private Long cycle;
+    private Long workLoad;
+    private Long id;
+    private String tags;
+    private Integer status;
+    private Timestamp beginTime;
+    private Timestamp completeTime;
+}

src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java

@@ -168,8 +168,24 @@ public class ProjectServiceImpl implements ProjectService {
 
     @Override
     public BaseResponse getWorkById(Integer id) {
-        ProjectWorkDO projectWorkDO = projectMapper.getWorkById(id);
+        ProjectWorkSimpleVO projectWorkSimpleVO = projectMapper.getWorkById(id);
-        return ResultUtil.success(projectWorkDO);
+
+        projectWorkSimpleVO.setPrincipalUser(userDAO.getUserById(projectMapper.getPid(id)).getUsername());
+        // 解析JSON字符串
+        JsonNode rootNode = null;
+        try {
+            rootNode = objectMapper.readTree(projectWorkSimpleVO.getDescription());
+            // 访问特定的key
+            JsonNode targetNode = rootNode.get("description");
+            if(targetNode != null && !rootNode.isNull()){
+                projectWorkSimpleVO.setDescription(targetNode.asText());
+            }else{
+                projectWorkSimpleVO.setDescription("null");
+            }
+        } catch (JsonProcessingException ignored) {
+
+        }
+        return ResultUtil.success(projectWorkSimpleVO);
     }
 
     @Override

src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml

@@ -113,7 +113,7 @@
         <if test="is != null">
             (principal_id = #{userId} and is_delete=false) or
         </if>
-        id in(select project_id from organize_oa.oa_project_work where is_delete=false and status =1 and principal_id=#{userId})
+        id in(select project_id from organize_oa.oa_project_work where is_delete=false and principal_id=#{userId})
     </select>
 
     <select id="workget1" resultType="com.jsl.oa.model.doData.ProjectDO">