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

TASK:印花;

Browse Source
This commit is contained in:
shahaibo
2023-10-04 09:26:26 +08:00
parent fd5e47ecdc
commit 114b78bdfa
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
View File

@@ -459,7 +459,7 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
elementVO.setDesignLibraryModelPoint(calculateTemplatePointTemplate(modelPoint,1654,1170,byId.getUrl())); elementVO.setDesignLibraryModelPoint(calculateTemplatePointTemplate(modelPoint,1654,1170,byId.getUrl()));
} }
} }
// elementVO.setDesignLibraryModelPoint(calculateTemplatePointTemplate(null,1654,1170,null)); elementVO.setDesignLibraryModelPoint(calculateTemplatePointTemplate(null,null,null,null));
return elementVO; return elementVO;
} }
@Override @Override

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

@@ -480,9 +480,9 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
designCollectionItems.add(designCollectionItemVO); designCollectionItems.add(designCollectionItemVO);
List<DesignItemDetail> designItemDetails = Lists.newArrayList(); List<DesignItemDetail> designItemDetails = Lists.newArrayList();
item.getItems().forEach(detail -> { for (DesignPythonItem detail : item.getItems()) {
if (null == detail) { if (null == detail) {
return; continue;
} }
DesignItemDetail designItemDetail = CopyUtil.copyObject(detail, DesignItemDetail.class); DesignItemDetail designItemDetail = CopyUtil.copyObject(detail, DesignItemDetail.class);
designItemDetail.setAccountId(userInfo.getId()); designItemDetail.setAccountId(userInfo.getId());
@@ -499,11 +499,14 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
DesignPythonItemPrint printObject = detail.getPrint(); DesignPythonItemPrint printObject = detail.getPrint();
designItemDetail.setPrintPath(Objects.isNull(printObject) ? "" : printObject.getPath()); designItemDetail.setPrintPath(Objects.isNull(printObject) ? "" : printObject.getPath());
designItemDetailService.save(designItemDetail); designItemDetailService.save(designItemDetail);
if (SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())) {
continue;
}
DesignItemDetailPrint print = new DesignItemDetailPrint(); DesignItemDetailPrint print = new DesignItemDetailPrint();
print.setDesignItemDetailId(designItemDetail.getId()); print.setDesignItemDetailId(designItemDetail.getId());
print.setPath(designItemDetail.getPrintPath()); print.setPath(designItemDetail.getPrintPath());
designItemDetailPrintService.save(print); designItemDetailPrintService.save(print);
}); }
} }
return response; return response;