|
@@ -1185,6 +1185,7 @@ public class WmPackageManager {
|
|
model.setQuarter(quarterMap.get(pkg.getCreateTime().getMonthValue() / 3 + 1));
|
|
model.setQuarter(quarterMap.get(pkg.getCreateTime().getMonthValue() / 3 + 1));
|
|
model.setProduct(scope.drugtableMap.getOrDefault(pkg.getDrugtable()[0], new WmDaDrugEntDrugtable()).getDrugnameTy());
|
|
model.setProduct(scope.drugtableMap.getOrDefault(pkg.getDrugtable()[0], new WmDaDrugEntDrugtable()).getDrugnameTy());
|
|
model.setPkgName(pkg.getScorePackageName());
|
|
model.setPkgName(pkg.getScorePackageName());
|
|
|
|
+ model.setPkgId(pkg.getId());
|
|
int plannedQty = scope.parentId2PkgMap.getOrDefault(pkg.getId(), new ArrayList<>())
|
|
int plannedQty = scope.parentId2PkgMap.getOrDefault(pkg.getId(), new ArrayList<>())
|
|
.stream().mapToInt(Integer::parseInt).reduce(0, (cnt, cPkgId) -> {
|
|
.stream().mapToInt(Integer::parseInt).reduce(0, (cnt, cPkgId) -> {
|
|
cnt += scope.pttMap.getOrDefault(cPkgId, new ArrayList<>())
|
|
cnt += scope.pttMap.getOrDefault(cPkgId, new ArrayList<>())
|
|
@@ -1295,7 +1296,6 @@ public class WmPackageManager {
|
|
}
|
|
}
|
|
model.setAllRejectNum(Integer.toString(rejected[2]+rejected[3]+rejected[8]+rejected[9]+rejected[5]+rejected[6]));
|
|
model.setAllRejectNum(Integer.toString(rejected[2]+rejected[3]+rejected[8]+rejected[9]+rejected[5]+rejected[6]));
|
|
model.setAlllTodoNum(Integer.toString(todos[2]+todos[3]+todos[8]+todos[9]+todos[5]+todos[6]));
|
|
model.setAlllTodoNum(Integer.toString(todos[2]+todos[3]+todos[8]+todos[9]+todos[5]+todos[6]));
|
|
- model.setPkgId(pkg.getId());
|
|
|
|
return model;
|
|
return model;
|
|
}
|
|
}
|
|
).forEach(model -> {result.add(model); });
|
|
).forEach(model -> {result.add(model); });
|