Merge branch 'develop' into feature-zrx

Reviewed-on: #27
Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>

src/main/java/com/jsl/oa/model/dodata/ProjectChildDO.java

@@ -31,4 +31,6 @@ public class ProjectChildDO {
     private Timestamp createdAt;
     private Timestamp completeTime;
     private Timestamp updatedAt;
+    private String status;
+    private Timestamp deadLine;
 }

src/main/java/com/jsl/oa/model/dodata/ProjectModuleDO.java

@@ -17,6 +17,8 @@ public class ProjectModuleDO {
     private String description;
     private String name;
     private Integer isDelete;
+    private String status;
+    private Timestamp deadLine;
     private Timestamp createdAt;
     private Timestamp updatedAt;
     private Timestamp completeTime;

src/main/java/com/jsl/oa/model/vodata/ProjectChildGetVO.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 ProjectChildGetVO {
+    private Long id;
+    private String principalName;
+    private Long projectId;
+    private Integer workLoad;
+    private Integer cycle;
+    private String name;
+    private String description;
+    private Integer isDelete;
+    private String status;
+    private Timestamp deadLine;
+}

src/main/java/com/jsl/oa/model/vodata/ProjectWorkAndNameVO.java

@@ -15,19 +15,17 @@ import java.sql.Timestamp;
 public class ProjectWorkAndNameVO {
 
     private Long id;
-    private Long pid;
     private String childSystemName;
-    private Long projectId;
+    private Long projectChildId;
     private Long principalId;
     private String principalUser;
     private Integer cycle;
     private Integer workLoad;
-    private Integer type;
     private String name;
     private String description;
     private Integer isDelete;
-    private Integer isFinish;
-    private boolean status;
+    private String status;
+    private Timestamp deadLine;
     private Timestamp beginTime;
     private Timestamp completeTime;
 }

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

@@ -6,6 +6,7 @@ import com.jsl.oa.dao.UserDAO;
 import com.jsl.oa.mapper.ModuleMapper;
 import com.jsl.oa.model.dodata.ProjectChildDO;
 import com.jsl.oa.model.dodata.ProjectModuleDO;
+import com.jsl.oa.model.vodata.ProjectChildGetVO;
 import com.jsl.oa.model.vodata.ProjectWorkAndNameVO;
 import com.jsl.oa.services.ModuleService;
 import com.jsl.oa.utils.BaseResponse;
@@ -42,9 +43,15 @@ public class ModuleServiceImpl implements ModuleService {
             log.info("不是负责人");
             is = 0;
         }
-
         List<ProjectChildDO> projectWorkDOList = moduleMapper.getByProjectId(projectId, userId, is);
-        return ResultUtil.success(projectWorkDOList);
+        List<ProjectChildGetVO> projectWorkAndNameVOS = new ArrayList<>();
+        for (ProjectChildDO projectWorkDO : projectWorkDOList) {
+            ProjectChildGetVO projectWorkAndNameVO = new ProjectChildGetVO();
+            Processing.copyProperties(projectWorkDO, projectWorkAndNameVO);
+            projectWorkAndNameVO.setPrincipalName(userDAO.getUserById(projectWorkDO.getPrincipalId()).getUsername());
+            projectWorkAndNameVOS.add(projectWorkAndNameVO);
+        }
+        return ResultUtil.success(projectWorkAndNameVOS);
     }
 
     @Override