|
@@ -1151,6 +1151,11 @@ public class WmPackageManager {
|
|
.flatMap(list -> list.stream())
|
|
.flatMap(list -> list.stream())
|
|
.sorted()
|
|
.sorted()
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
|
+
|
|
|
|
+ if(CollUtil.isEmpty(cPkgIdBatch)) {
|
|
|
|
+ log.warn("No child pkg found in batch: {}", i);
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
List<WmTask> tasks =
|
|
List<WmTask> tasks =
|
|
taskService.list(
|
|
taskService.list(
|
|
Wrappers.<WmTask>lambdaQuery()
|
|
Wrappers.<WmTask>lambdaQuery()
|
|
@@ -1191,6 +1196,10 @@ public class WmPackageManager {
|
|
model.setTaskNumSubmitted(Integer.toString(actualQty));
|
|
model.setTaskNumSubmitted(Integer.toString(actualQty));
|
|
|
|
|
|
List<Map<String, Object>> checkList = pkg2CheckListMap.getOrDefault(pkg.getId(), new ArrayList<>());
|
|
List<Map<String, Object>> checkList = pkg2CheckListMap.getOrDefault(pkg.getId(), new ArrayList<>());
|
|
|
|
+ if(CollUtil.isEmpty(checkList)) {
|
|
|
|
+ log.warn("No check his found for pkg: {}", pkg.getId());
|
|
|
|
+ return model;
|
|
|
|
+ }
|
|
checkList.sort((a, b) -> {
|
|
checkList.sort((a, b) -> {
|
|
int ret = Integer.compare(toInteger(a.get("task_id")), toInteger(b.get("task_id")));
|
|
int ret = Integer.compare(toInteger(a.get("task_id")), toInteger(b.get("task_id")));
|
|
if(ret == 0) {
|
|
if(ret == 0) {
|
|
@@ -1379,6 +1388,10 @@ public class WmPackageManager {
|
|
Wrappers.<WmScorePackage>lambdaQuery()
|
|
Wrappers.<WmScorePackage>lambdaQuery()
|
|
.eq(WmScorePackage::getEnableFlag, EnableEnum.ENABLE.val())
|
|
.eq(WmScorePackage::getEnableFlag, EnableEnum.ENABLE.val())
|
|
.in(WmScorePackage::getRelationScoreId, pkgIds));
|
|
.in(WmScorePackage::getRelationScoreId, pkgIds));
|
|
|
|
+
|
|
|
|
+ if (CollUtil.isEmpty(childrenPkgs)) {
|
|
|
|
+ throw new BizException("没有找到可导出的个人包记录");
|
|
|
|
+ }
|
|
List<String> cPkgIds =
|
|
List<String> cPkgIds =
|
|
childrenPkgs.stream()
|
|
childrenPkgs.stream()
|
|
.map(WmScorePackage::getId)
|
|
.map(WmScorePackage::getId)
|
|
@@ -1405,6 +1418,10 @@ public class WmPackageManager {
|
|
.distinct()
|
|
.distinct()
|
|
.sorted()
|
|
.sorted()
|
|
.collect(Collectors.toList()));
|
|
.collect(Collectors.toList()));
|
|
|
|
+
|
|
|
|
+ if (CollUtil.isEmpty(taskTypeQties)) {
|
|
|
|
+ throw new BizException("没有找到可导出的任务下发记录");
|
|
|
|
+ }
|
|
Map<Integer, List<WmPackageTaskTypeQty>> pttMap =
|
|
Map<Integer, List<WmPackageTaskTypeQty>> pttMap =
|
|
taskTypeQties.stream().collect(Collectors.groupingBy(WmPackageTaskTypeQty::getPackageId));
|
|
taskTypeQties.stream().collect(Collectors.groupingBy(WmPackageTaskTypeQty::getPackageId));
|
|
|
|
|