|
@@ -1167,7 +1167,9 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
|
|
|
|
Map<String, Integer> parent = relPkgTtq.stream().collect(Collectors.toMap(WmPackageTaskTypeQty::getTaskTypeName, WmPackageTaskTypeQty::getQty, (v1, v2) -> v2));
|
|
Map<String, Integer> parent = relPkgTtq.stream().collect(Collectors.toMap(WmPackageTaskTypeQty::getTaskTypeName, WmPackageTaskTypeQty::getQty, (v1, v2) -> v2));
|
|
|
|
|
|
- List<WmScorePackage> list = this.list(Wrappers.<WmScorePackage>lambdaQuery().eq(WmScorePackage::getRelationScoreId, wmScorePackage.getRelationScoreId()));
|
|
|
|
|
|
+ List<WmScorePackage> list = this.list(Wrappers.<WmScorePackage>lambdaQuery()
|
|
|
|
+ .ne(WmScorePackage::getScorePackageStatus, UpmsState.ScorePackageState.STOP)
|
|
|
|
+ .eq(WmScorePackage::getRelationScoreId, wmScorePackage.getRelationScoreId()));
|
|
if (CollUtil.isNotEmpty(list)) {
|
|
if (CollUtil.isNotEmpty(list)) {
|
|
Set<Integer> pkgIds = list.stream().map(pkg -> Integer.valueOf(pkg.getId())).collect(Collectors.toSet());
|
|
Set<Integer> pkgIds = list.stream().map(pkg -> Integer.valueOf(pkg.getId())).collect(Collectors.toSet());
|
|
List<WmPackageTaskTypeQty> taskTypeQtyList
|
|
List<WmPackageTaskTypeQty> taskTypeQtyList
|