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

Merge remote-tracking branch 'origin/dev/dev' into dev/dev

Browse Source
This commit is contained in:
xupei
2024-04-22 13:18:57 +08:00
parent a749c5dd2e e62f54a975
commit 825439255b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -624,6 +625,7 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
Generate byId = generateService.getById(o.getGenerateId()); Generate byId = generateService.getById(o.getGenerateId());
d.setAccountId(byId.getAccountId()); d.setAccountId(byId.getAccountId());
d.setLevel1Type(byId.getLevel1Type()); d.setLevel1Type(byId.getLevel1Type());
d.setCreateDate(Date.from(o.getCreateDate().atZone(ZoneId.systemDefault()).toInstant()));
if (null != idToMap) { if (null != idToMap) {
CollectionSketchDTO sketchDTO = idToMap.get(o.getId()); CollectionSketchDTO sketchDTO = idToMap.get(o.getId());
d.setLevel2Type(sketchDTO.getLevel2Type()); d.setLevel2Type(sketchDTO.getLevel2Type());
@@ -646,6 +648,7 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
Generate byId = generateService.getById(o.getGenerateId()); Generate byId = generateService.getById(o.getGenerateId());
d.setAccountId(byId.getAccountId()); d.setAccountId(byId.getAccountId());
d.setLevel1Type(byId.getLevel1Type()); d.setLevel1Type(byId.getLevel1Type());
d.setCreateDate(Date.from(o.getCreateDate().atZone(ZoneId.systemDefault()).toInstant()));
if (null != idToMap) { if (null != idToMap) {
DesignCollectionPrintElementDTO printDTO = idToMap.get(o.getId()); DesignCollectionPrintElementDTO printDTO = idToMap.get(o.getId());
d.setHasPin(printDTO.getIsPin()); d.setHasPin(printDTO.getIsPin());