|
@@ -245,15 +245,14 @@ public class ApiController {
|
|
} else if ("47".equals(taskTypeId) || "48".equals(taskTypeId) || "49".equals(taskTypeId) || "50".equals(taskTypeId)) {
|
|
} else if ("47".equals(taskTypeId) || "48".equals(taskTypeId) || "49".equals(taskTypeId) || "50".equals(taskTypeId)) {
|
|
// 库存调研、竞品调研、培训、使用情况调查 都取47
|
|
// 库存调研、竞品调研、培训、使用情况调查 都取47
|
|
connfigMap = getTaskContentConfigByTaskTypeId("47");
|
|
connfigMap = getTaskContentConfigByTaskTypeId("47");
|
|
|
|
+ // 查询积分值
|
|
|
|
+ List<WmTaskType> taskTypes = wmTaskTypeService.listByIds(CollUtil.toList("47", "48", "49", "50"));
|
|
|
|
+ Map<String, Integer> taskTypeScoreMap = taskTypes.stream().collect(Collectors.toMap(WmTaskType::getId, WmTaskType::getScore));
|
|
|
|
+ connfigMap.put("taskTypeScore", taskTypeScoreMap);
|
|
} else {
|
|
} else {
|
|
connfigMap = getTaskContentConfigByTaskTypeId(taskTypeId);
|
|
connfigMap = getTaskContentConfigByTaskTypeId(taskTypeId);
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
- // 查询积分值
|
|
|
|
- WmTaskType taskType = wmTaskTypeService.getById(taskTypeId);
|
|
|
|
- connfigMap.put("score", taskType.getScore());
|
|
|
|
-
|
|
|
|
return R.ok(connfigMap);
|
|
return R.ok(connfigMap);
|
|
}
|
|
}
|
|
|
|
|