TASK:模块化;
This commit is contained in:
@@ -30,6 +30,7 @@ public class ProjectChooseVO {
|
||||
//
|
||||
//// private Portfolio portfolio;
|
||||
// private PortfolioDTO portfolioDTO;
|
||||
private String name;
|
||||
|
||||
private WorkspaceVO workspaceVO;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ai.da.model.vo;
|
||||
|
||||
import com.ai.da.mapper.primary.entity.Project;
|
||||
import com.ai.da.mapper.primary.entity.UserLikeGroup;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
@@ -9,13 +10,13 @@ import java.util.List;
|
||||
|
||||
@Data
|
||||
@ApiModel("用户savedCollection分组-响应")
|
||||
public class ProjectVO {
|
||||
public class ProjectVO extends Project {
|
||||
|
||||
@ApiModelProperty("分组ID")
|
||||
private Long id;
|
||||
// @ApiModelProperty("分组ID")
|
||||
// private Long id;
|
||||
|
||||
private UserLikeGroupVO userLikeGroupVO;
|
||||
|
||||
@ApiModelProperty("更新时间")
|
||||
// @ApiModelProperty("更新时间")
|
||||
private Long updateDate;
|
||||
}
|
||||
|
||||
@@ -266,6 +266,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
||||
WorkspaceVO workspaceVO = workspaceService.getByIdForProject(workspaceId);
|
||||
|
||||
String process = project.getProcess();
|
||||
String name = project.getName();
|
||||
|
||||
// UserLikeGroup group = getByProjectId(projectDTO.getId());
|
||||
// if (Objects.isNull(group)) {
|
||||
@@ -327,7 +328,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
||||
// beenPublished = 1;
|
||||
// portfolioDTO.setTagsDTO(tagsMapper.getTagByPortfolioId(portfolioDTO.getId()));
|
||||
// }
|
||||
return new ProjectChooseVO(projectDTO.getId(), workspaceVO, process);
|
||||
return new ProjectChooseVO(projectDTO.getId(), name, workspaceVO, process);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -408,6 +408,7 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
|
||||
libraryQueryWrapper.lambda().eq(Library::getLevel1Type, LibraryLevel1TypeEnum.MODELS.getRealName());
|
||||
libraryQueryWrapper.lambda().eq(Library::getLevel2Type, sex);
|
||||
libraryQueryWrapper.lambda().eq(Library::getLevel3Type, ageGroup);
|
||||
libraryQueryWrapper.lambda().orderByDesc(Library::getCreateDate);
|
||||
List<Library> libraries = libraryMapper.selectList(libraryQueryWrapper);
|
||||
if (!CollectionUtils.isEmpty(libraries)) {
|
||||
List<ModelVO> modelVOList = new ArrayList<>();
|
||||
|
||||
Reference in New Issue
Block a user