rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'technology/rakor-w1' into technology-init-lhj1119

This commit is contained in:
曹鹏飞 2024-12-04 11:04:30 +08:00
parent 3de455507f edc78f9e1b
commit 65dcfb0671
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/PaintCostConfigService.java
View File

@ -16,6 +16,7 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
@Service
@ -28,7 +29,10 @@ public class PaintCostConfigService extends ServiceImpl<PaintCostConfigMapper, P
remove(new QueryWrapper<>());
return;
}
baseMapper.delete(Wrappers.lambdaQuery(PaintCostConfigEntity.class).notIn(PaintCostConfigEntity::getId, configs.stream().map(PaintCostConfig::getId).filter(Objects::nonNull).collect(Collectors.toSet())));
Set<Integer> ids = configs.stream().map(PaintCostConfig::getId).filter(Objects::nonNull).collect(Collectors.toSet());
if (CollectionUtil.isNotEmpty(ids)) {
baseMapper.delete(Wrappers.lambdaQuery(PaintCostConfigEntity.class).notIn(PaintCostConfigEntity::getId, ids));
}
List<PaintCostConfigEntity> forAdd = new ArrayList<>();
List<PaintCostConfigEntity> forUpdate = new ArrayList<>();
configs.forEach(c -> {

6
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/SteelsCostConfigService.java
View File

@ -16,6 +16,7 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
@Service
@ -28,7 +29,10 @@ public class SteelsCostConfigService extends ServiceImpl<SteelsCostConfigMapper,
remove(new QueryWrapper<>());
return;
}
baseMapper.delete(Wrappers.lambdaQuery(SteelsCostConfigEntity.class).notIn(SteelsCostConfigEntity::getId, configs.stream().map(SteelsCostConfig::getId).filter(Objects::nonNull).collect(Collectors.toSet())));
Set<Integer> ids = configs.stream().map(SteelsCostConfig::getId).filter(Objects::nonNull).collect(Collectors.toSet());
if (CollectionUtil.isNotEmpty(ids)) {
baseMapper.delete(Wrappers.lambdaQuery(SteelsCostConfigEntity.class).notIn(SteelsCostConfigEntity::getId, ids));
}
List<SteelsCostConfigEntity> forAdd = new ArrayList<>();
List<SteelsCostConfigEntity> forUpdate = new ArrayList<>();
configs.forEach(c -> {

10
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/VirtualWorkingService.java
View File

@ -19,6 +19,7 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
/**
@ -38,7 +39,10 @@ public class VirtualWorkingService extends ServiceImpl<VirtualWorkingMapper, Vir
remove(new QueryWrapper<>());
return;
}
baseMapper.delete(Wrappers.lambdaQuery(VirtualWorkingEntity.class).notIn(VirtualWorkingEntity::getId, list.stream().map(VirtualWorking::getId).filter(Objects::nonNull).collect(Collectors.toSet())));
Set<Integer> ids = list.stream().map(VirtualWorking::getId).filter(Objects::nonNull).collect(Collectors.toSet());
if (CollectionUtil.isNotEmpty(ids)) {
baseMapper.delete(Wrappers.lambdaQuery(VirtualWorkingEntity.class).notIn(VirtualWorkingEntity::getId, ids));
}
List<WorkingTypeEntity> types = workingTypeService.list();
List<VirtualWorkingEntity> forAdd = new ArrayList<>();
List<VirtualWorkingEntity> forUpdate = new ArrayList<>();
@ -79,6 +83,8 @@ public class VirtualWorkingService extends ServiceImpl<VirtualWorkingMapper, Vir
@Transactional
public void deleteNotInNames(@NotNull List<String> collect) {
baseMapper.delete(Wrappers.lambdaQuery(VirtualWorkingEntity.class).notIn(VirtualWorkingEntity::getName, collect));
if (CollectionUtil.isNotEmpty(collect)) {
baseMapper.delete(Wrappers.lambdaQuery(VirtualWorkingEntity.class).notIn(VirtualWorkingEntity::getName, collect));
}
}
}