|
@@ -585,7 +585,7 @@ public class WmPackageManager {
|
|
DateTimeFormatter.ofPattern(DatePattern.CHINESE_DATE_PATTERN).format(endDate)));
|
|
DateTimeFormatter.ofPattern(DatePattern.CHINESE_DATE_PATTERN).format(endDate)));
|
|
}
|
|
}
|
|
|
|
|
|
- // 获取上级包
|
|
|
|
|
|
+ // 获取区域的上级包
|
|
List<String> ppid =
|
|
List<String> ppid =
|
|
pkgs.stream()
|
|
pkgs.stream()
|
|
.map(WmScorePackage::getRelationScoreId)
|
|
.map(WmScorePackage::getRelationScoreId)
|
|
@@ -673,7 +673,7 @@ public class WmPackageManager {
|
|
// taskService.list(Wrappers.<WmTask>lambdaQuery().in(WmTask::getScorePackageId,
|
|
// taskService.list(Wrappers.<WmTask>lambdaQuery().in(WmTask::getScorePackageId,
|
|
// cPkgIds).ne(WmTask::getTaskStatus, UpmsState.TaskState.REJECTED));
|
|
// cPkgIds).ne(WmTask::getTaskStatus, UpmsState.TaskState.REJECTED));
|
|
|
|
|
|
- // 根据任务类型id分组
|
|
|
|
|
|
+ // 根据包id分组
|
|
Map<String, List<WmTask>> pkg2TaskListMap =
|
|
Map<String, List<WmTask>> pkg2TaskListMap =
|
|
tasks.stream().collect(Collectors.groupingBy(WmTask::getScorePackageId));
|
|
tasks.stream().collect(Collectors.groupingBy(WmTask::getScorePackageId));
|
|
|
|
|
|
@@ -702,6 +702,7 @@ public class WmPackageManager {
|
|
|
|
|
|
// 父级包
|
|
// 父级包
|
|
WmScorePackage wmScorePackages = ppMap.get(pkg.getRelationScoreId());
|
|
WmScorePackage wmScorePackages = ppMap.get(pkg.getRelationScoreId());
|
|
|
|
+ model.setParentPkgProvAbbr(wmScorePackages.getProvAbbr());
|
|
model.setParentPkgName(
|
|
model.setParentPkgName(
|
|
wmScorePackages != null ? wmScorePackages.getScorePackageName() : "");
|
|
wmScorePackages != null ? wmScorePackages.getScorePackageName() : "");
|
|
|
|
|