refactor: 回退

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

@@ -3227,16 +3227,14 @@ public class ApiController {
 			return R.failed("参数异常，请求失败");
 		}
 		//获取用户基本信息
-		Integer userId = SecurityUtils.getUser().getId();
-		if (null == userId) {
+		if (null == SecurityUtils.getUser().getId()) {
 			return R.failed("请求失败");
 		}
 
-		// SysUser sysUser = sysUserService.getById(SecurityUtils.getUser().getId());
-
+		SysUser sysUser = sysUserService.getById(SecurityUtils.getUser().getId());
 
 		WmScorePackageStatus wmScorePackageStatus = new WmScorePackageStatus();
-		wmScorePackageStatus.setUserId(String.valueOf(userId));
+		wmScorePackageStatus.setUserId(sysUser.getUserId() + "");
 		wmScorePackageStatus.setTaskAddFlag("1");
 		wmScorePackageStatus.setStatus("2");
 		wmScorePackageStatus.setDelFlag("0");
@@ -3246,112 +3244,43 @@ public class ApiController {
 
 		List<Map<String, Object>> listMap = new ArrayList<>();
 
-		List<String> collect = statusList.stream().map(WmScorePackageStatus::getPackageId).collect(Collectors.toList());
-
-		if (CollUtil.isEmpty(collect)) {
-			return R.ok(listMap);
-		}
-
-		List<WmScorePackage> list = wmScorePackageService.list(Wrappers.<WmScorePackage>lambdaQuery().in(WmScorePackage::getId, collect));
-
-		List<WmScorePackage> wmScorePackages = list.stream().filter(w -> !"0".equals(w.getTaskAddFlag()) && !"1".equals(w.getEnableFlag()) && "2".equals(w.getPackageType2())
-				&& "3".equals(w.getPackageType1())).collect(Collectors.toList());
+		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));
 
-		List<String> pIds = wmScorePackages.stream().map(WmScorePackage::getId).collect(Collectors.toList());
+				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);
+				}
 
-		if (CollUtil.isEmpty(pIds)) {
-			return R.ok(listMap);
+			}
 		}
 
-		List<WmScoreTaskType> tts = wmScoreTaskTypeService.list(Wrappers.<WmScoreTaskType>lambdaQuery().eq(WmScoreTaskType::getTaskTypeId, type)
-				.in(WmScoreTaskType::getScoreId, pIds)
-		);
-
-
-		Set<String> pids = tts.stream().map(WmScoreTaskType::getScoreId).collect(Collectors.toSet());
-
-
-		Map<String, List<WmScorePackage>> pMap = wmScorePackages.stream().collect(Collectors.groupingBy(WmScorePackage::getId));
-
-
-		pids.forEach(id -> {
-
-			WmScorePackage p = pMap.get(id).get(0);
-			Map<String, Object> map = new HashMap<>();
-			map.put("label", p.getScorePackageName());
-			map.put("value", id);
-			String drugProducer = ArrayUtils.isEmpty(p.getDrugProducerList()) ? "" : String.join(StrUtil.COMMA, p.getDrugProducerList());
-			map.put("drugProducer", drugProducer);
-			listMap.add(map);
-
-		});
-
-
-		// 		.map(w -> {
-		// 			WmScoreTaskType tt = new WmScoreTaskType();
-		// 			tt.setTaskTypeId(type);
-		// 			tt.setScoreId(w.getId());
-		// 			return tt;
-		// }).
-
-
-		// 		//.forEach( w -> {
-		// 	/**
-		// 	 * 过滤有效任务类型
-		// 	 */
-		// 	WmScoreTaskType taskType = new WmScoreTaskType();
-		// 	taskType.setTaskTypeId(type);
-		// 	taskType.setScoreId(w.getId());
-		// 	int total = wmScoreTaskTypeService.count(Wrappers.query(taskType));
-		//
-		// 	if (total != 0) {
-		// 		Map<String, Object> map = new HashMap<>();
-		// 		map.put("label", w.getScorePackageName());
-		// 		map.put("value", w.getId());
-		// 		String drugProducer = ArrayUtils.isEmpty(w.getDrugProducerList()) ? "" : String.join(StrUtil.COMMA, w.getDrugProducerList());
-		// 		map.put("drugProducer", drugProducer);
-		// 		listMap.add(map);
-		// 	}
-		//
-		// } );
-
-// 		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);
 	}