Compare commits

..

No commits in common. "70b6cf5090c1b9f4339a3af106643cdc3c60de22" and "4a0624e0a57c2aaae2d20ad0e9e0b3731d69fb18" have entirely different histories.

5 changed files with 7 additions and 40 deletions

View File

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

View File

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

View File

@ -1,24 +0,0 @@
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;
}

View File

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

View File

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