|
@@ -97,25 +97,32 @@ public class WmDeptTaskTypeConfigServiceImpl extends ServiceImpl<WmDeptTaskTypeC
|
|
add("省级学科年会");
|
|
add("省级学科年会");
|
|
}};
|
|
}};
|
|
BASE_TASK_TYPE_MAP.put("会议举办", meetingList);
|
|
BASE_TASK_TYPE_MAP.put("会议举办", meetingList);
|
|
|
|
+
|
|
List<String> interviewList = new ArrayList<String>() {{
|
|
List<String> interviewList = new ArrayList<String>() {{
|
|
add("一对一专访");
|
|
add("一对一专访");
|
|
}};
|
|
}};
|
|
BASE_TASK_TYPE_MAP.put("一对一专访", interviewList);
|
|
BASE_TASK_TYPE_MAP.put("一对一专访", interviewList);
|
|
|
|
+
|
|
List<String> customerList = new ArrayList<String>() {{
|
|
List<String> customerList = new ArrayList<String>() {{
|
|
add("医院拜访");
|
|
add("医院拜访");
|
|
add("商业公司拜访");
|
|
add("商业公司拜访");
|
|
add("药店拜访");
|
|
add("药店拜访");
|
|
}};
|
|
}};
|
|
BASE_TASK_TYPE_MAP.put("客户拜访", customerList);
|
|
BASE_TASK_TYPE_MAP.put("客户拜访", customerList);
|
|
|
|
+
|
|
List<String> producrList = new ArrayList<String>() {{
|
|
List<String> producrList = new ArrayList<String>() {{
|
|
add("产品相册分享");
|
|
add("产品相册分享");
|
|
|
|
+ add("受众打开产品相册");
|
|
add("电子名片分享");
|
|
add("电子名片分享");
|
|
}};
|
|
}};
|
|
BASE_TASK_TYPE_MAP.put("产品推广", producrList);
|
|
BASE_TASK_TYPE_MAP.put("产品推广", producrList);
|
|
|
|
+
|
|
List<String> academicList = new ArrayList<String>() {{
|
|
List<String> academicList = new ArrayList<String>() {{
|
|
add("学术信息交流");
|
|
add("学术信息交流");
|
|
|
|
+ add("受众阅读文章");
|
|
}};
|
|
}};
|
|
BASE_TASK_TYPE_MAP.put("学术信息交流", academicList);
|
|
BASE_TASK_TYPE_MAP.put("学术信息交流", academicList);
|
|
|
|
+
|
|
List<String> marketList = new ArrayList<String>() {{
|
|
List<String> marketList = new ArrayList<String>() {{
|
|
add("政策信息收集");
|
|
add("政策信息收集");
|
|
add("竞品信息收集");
|
|
add("竞品信息收集");
|
|
@@ -126,6 +133,7 @@ public class WmDeptTaskTypeConfigServiceImpl extends ServiceImpl<WmDeptTaskTypeC
|
|
add("药店调查");
|
|
add("药店调查");
|
|
}};
|
|
}};
|
|
BASE_TASK_TYPE_MAP.put("市场信息收集", marketList);
|
|
BASE_TASK_TYPE_MAP.put("市场信息收集", marketList);
|
|
|
|
+
|
|
List<String> medicineList = new ArrayList<String>() {{
|
|
List<String> medicineList = new ArrayList<String>() {{
|
|
add("专家咨询");
|
|
add("专家咨询");
|
|
add("受试者管理");
|
|
add("受试者管理");
|
|
@@ -329,11 +337,10 @@ public class WmDeptTaskTypeConfigServiceImpl extends ServiceImpl<WmDeptTaskTypeC
|
|
List<String> finalConfigTaskTypeIdList = configTaskTypeIdList;
|
|
List<String> finalConfigTaskTypeIdList = configTaskTypeIdList;
|
|
List<String> finalAncestorConfigTaskTypeIdList = ancestorConfigTaskTypeIdList;
|
|
List<String> finalAncestorConfigTaskTypeIdList = ancestorConfigTaskTypeIdList;
|
|
List<WmTaskType> filterTaskTypeList = taskTypeList.stream()
|
|
List<WmTaskType> filterTaskTypeList = taskTypeList.stream()
|
|
- .filter(wmTaskType -> wmTaskType.getParentId() != null
|
|
|
|
- && (
|
|
|
|
|
|
+ .filter(wmTaskType ->
|
|
(finalConfigTaskTypeIdList != null && finalConfigTaskTypeIdList.contains(wmTaskType.getTaskTypeName()))
|
|
(finalConfigTaskTypeIdList != null && finalConfigTaskTypeIdList.contains(wmTaskType.getTaskTypeName()))
|
|
|| (finalAncestorConfigTaskTypeIdList != null && finalAncestorConfigTaskTypeIdList.contains(wmTaskType.getTaskTypeName()))
|
|
|| (finalAncestorConfigTaskTypeIdList != null && finalAncestorConfigTaskTypeIdList.contains(wmTaskType.getTaskTypeName()))
|
|
- ))
|
|
|
|
|
|
+ )
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
BASE_TASK_TYPE_MAP.forEach((key, val) -> {
|
|
BASE_TASK_TYPE_MAP.forEach((key, val) -> {
|
|
List<WmTaskType> childTypeList = filterTaskTypeList.stream()
|
|
List<WmTaskType> childTypeList = filterTaskTypeList.stream()
|