aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TASK:collection sort；

Browse Source
This commit is contained in:
shahaibo
2025-05-30 15:02:39 +08:00
parent 73bab2338e
commit f0b1d3f9ce
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/model/vo/DesignCollectionItemVO.java
View File

@@ -24,6 +24,8 @@ public class DesignCollectionItemVO {
private String objectSign; private String objectSign;
private String resultType;
public DesignCollectionItemVO() { public DesignCollectionItemVO() {
} }

2
src/main/java/com/ai/da/model/vo/DesignCollectionVO.java
View File

@@ -25,8 +25,6 @@ public class DesignCollectionVO {
private List<String> UnfinishedList; private List<String> UnfinishedList;
private String resultType;
public DesignCollectionVO() { public DesignCollectionVO() {
} }
} }

10
src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
View File

@@ -1032,7 +1032,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
//生成designItem //生成designItem
Long designItemId = designItemService.saveOne(designItem); Long designItemId = designItemService.saveOne(designItem);
//response //response
designCollectionItems.add(new DesignCollectionItemVO(designItemId, designItem.getDesignUrl(), null, null, null)); designCollectionItems.add(new DesignCollectionItemVO(designItemId, designItem.getDesignUrl(), null, null, null, null));
List<DesignItemDetail> designItemDetails = Lists.newArrayList(); List<DesignItemDetail> designItemDetails = Lists.newArrayList();
item.getItems().forEach(detail -> { item.getItems().forEach(detail -> {
@@ -1131,15 +1131,15 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
} }
List<DesignItem> designItems = designItemService.getByDesignId(designId); List<DesignItem> designItems = designItemService.getByDesignId(designId);
if (CollectionUtils.isEmpty(designItems)) { if (CollectionUtils.isEmpty(designItems)) {
return new DesignCollectionVO(designId, design.getCollectionId(), null, null, null, null); return new DesignCollectionVO(designId, design.getCollectionId(), null, null, null);
} }
return new DesignCollectionVO(designId, design.getCollectionId(), coverDesignItemToVO(designItems), null, null, null); return new DesignCollectionVO(designId, design.getCollectionId(), coverDesignItemToVO(designItems), null, null);
} }
private List<DesignCollectionItemVO> coverDesignItemToVO(List<DesignItem> designItems) { private List<DesignCollectionItemVO> coverDesignItemToVO(List<DesignItem> designItems) {
List<DesignCollectionItemVO> response = Lists.newArrayList(); List<DesignCollectionItemVO> response = Lists.newArrayList();
designItems.forEach(designItem -> { designItems.forEach(designItem -> {
response.add(new DesignCollectionItemVO(designItem.getId(), designItem.getDesignUrl(), null, null, null)); response.add(new DesignCollectionItemVO(designItem.getId(), designItem.getDesignUrl(), null, null, null, null));
}); });
return response; return response;
} }
@@ -1810,10 +1810,10 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
} }
for (DesignCollectionItemVO designCollectionItem : result.getDesignCollectionItems()) { for (DesignCollectionItemVO designCollectionItem : result.getDesignCollectionItems()) {
String objectSign = designCollectionItem.getObjectSign(); String objectSign = designCollectionItem.getObjectSign();
designCollectionItem.setResultType(CollectionType.DESIGN.getValue());
objectSignList.remove(objectSign); objectSignList.remove(objectSign);
} }
result.setUnfinishedList(objectSignList); result.setUnfinishedList(objectSignList);
result.setResultType(CollectionType.DESIGN.getValue());
return result; return result;
} }