feat: 小程序任务调整

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

@@ -304,6 +304,10 @@ public class ApiController {
 
 					dictMap.put(config.getDictGroupName(), listMap);
 				}
+				else if ("package_drug_list".equals(config.getDictGroupName())) {
+					// 前端自动获取
+					dictMap.put(config.getDictGroupName(), "package_drug_list");
+				}
 
 			}
 		}
@@ -706,11 +710,19 @@ public class ApiController {
 		List<String> baseIds = wmScoreTaskTypeList.stream().
 				map(WmScoreTaskType::getTaskTypeId).collect(Collectors.toList());
 
-		List<WmTaskType> baseTypeList = wmTaskTypeService.
-				list(Wrappers.<WmTaskType>query().lambda().in(WmTaskType::getParentId, baseIds));
+		List<String> parentId = baseIds.stream().filter(item -> item.startsWith("p")).collect(Collectors.toList());
+		List<String> id = baseIds.stream().filter(item -> !item.startsWith("p")).collect(Collectors.toList());
+
+		List<WmTaskType> baseTypeList1 = wmTaskTypeService.
+				list(Wrappers.<WmTaskType>query().lambda().in(WmTaskType::getParentId, parentId));
+
+		List<WmTaskType> baseTypeList2 = wmTaskTypeService.
+				list(Wrappers.<WmTaskType>query().lambda().in(WmTaskType::getId, id));
+
+		baseTypeList1.addAll(baseTypeList2);
 
-		List<String> baseNames = baseTypeList.stream().
-				map(WmTaskType::getTaskTypeName).collect(Collectors.toList());
+		List<String> baseNames = baseTypeList1.stream().
+				map(WmTaskType::getTaskTypeName).distinct().collect(Collectors.toList());
 		WmTaskType wmTaskType = new WmTaskType();
 		wmTaskType.setRuleId(wmScorePackage.getRuleId());
 		wmTaskType.setDelFlag("0");