Merge branch 'feat-newtasktype-20220531' of googol/YY_BE_2 into master

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -3245,20 +3245,21 @@ public class ApiController {
 
 		List<Map<String, Object>> listMap = new ArrayList<>();
 
-		for (WmScorePackageStatus item : statusList) {
+
+		statusList.parallelStream().forEach(item -> {
 			WmScorePackage wmScorePackage = wmScorePackageService.getById(item.getPackageId());
 			if (null != wmScorePackage) {
 				if ("0".equals(wmScorePackage.getTaskAddFlag())) {
-					continue;
+					return;
 				}
 				if ("1".equals(wmScorePackage.getEnableFlag())) {
-					continue;
+					return;
 				}
 				if ("2".equals(wmScorePackage.getPackageType2())) {
-					continue;
+					return;
 				}
 				if ("3".equals(wmScorePackage.getPackageType1())) {
-					continue;
+					return;
 				}
 				/**
 				 * 过滤有效任务类型
@@ -3280,7 +3281,44 @@ public class ApiController {
 				}
 
 			}
-		}
+		});
+
+//		for (WmScorePackageStatus item : statusList) {
+//			WmScorePackage wmScorePackage = wmScorePackageService.getById(item.getPackageId());
+//			if (null != wmScorePackage) {
+//				if ("0".equals(wmScorePackage.getTaskAddFlag())) {
+//					continue;
+//				}
+//				if ("1".equals(wmScorePackage.getEnableFlag())) {
+//					continue;
+//				}
+//				if ("2".equals(wmScorePackage.getPackageType2())) {
+//					continue;
+//				}
+//				if ("3".equals(wmScorePackage.getPackageType1())) {
+//					continue;
+//				}
+//				/**
+//				 * 过滤有效任务类型
+//				 */
+//				WmScoreTaskType taskType = new WmScoreTaskType();
+//				taskType.setTaskTypeId(type);
+//				taskType.setScoreId(wmScorePackage.getId());
+////				List<WmScoreTaskType> taskTypes = wmScoreTaskTypeService.
+////						list(Wrappers.query(taskType));
+//				int total = wmScoreTaskTypeService.count(Wrappers.query(taskType));
+//
+//				if (total != 0) {
+//					Map<String, Object> map = new HashMap<>();
+//					map.put("label", wmScorePackage.getScorePackageName());
+//					map.put("value", wmScorePackage.getId());
+//					String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrUtil.COMMA, wmScorePackage.getDrugProducerList());
+//					map.put("drugProducer", drugProducer);
+//					listMap.add(map);
+//				}
+//
+//			}
+//		}
 
 		return R.ok(listMap);
 	}