|
@@ -249,10 +249,6 @@ public class ApiController {
|
|
|
} else if ("47".equals(taskTypeId) || "48".equals(taskTypeId) || "49".equals(taskTypeId) || "50".equals(taskTypeId)) {
|
|
|
// 库存调研、竞品调研、培训、使用情况调查 都取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 {
|
|
|
connfigMap = getTaskContentConfigByTaskTypeId(taskTypeId);
|
|
|
}
|
|
@@ -4501,5 +4497,40 @@ public class ApiController {
|
|
|
return R.ok(page);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 获取当前积分包对应的积分规则
|
|
|
+ *
|
|
|
+ * @param packageId 积分包id
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @GetMapping("/package-rule-task-type/{packageId}")
|
|
|
+ public R<?> getScorePackageRuleScore(@PathVariable("packageId") String packageId) {
|
|
|
+ WmScorePackage scorePackage = wmScorePackageService.getById(packageId);
|
|
|
+ if (scorePackage == null) {
|
|
|
+ throw new RuntimeException("积分包不存在");
|
|
|
+ }
|
|
|
+ // 查询当前企业的任务类型积分
|
|
|
+ WmTaskType queryTaskType = new WmTaskType();
|
|
|
+ queryTaskType.setRuleId(scorePackage.getRuleId());
|
|
|
+ queryTaskType.setDelFlag("0");
|
|
|
+ queryTaskType.setEnableFlag("0");
|
|
|
+ List<WmTaskType> list = wmTaskTypeService.list(Wrappers.query(queryTaskType));
|
|
|
+ if (CollUtil.isNotEmpty(list)) {
|
|
|
+ List<Map<String, Object>> result = list.stream().map(wmTaskType -> {
|
|
|
+ Map<String, Object> map = new HashMap<>(3);
|
|
|
+ map.put("taskTypeName", wmTaskType.getTaskTypeName());
|
|
|
+ if (wmTaskType.getTaskTypeName().startsWith("应收账款回款")) {
|
|
|
+ // 应收账款回款 任务类 保存的是1000倍数,需要转换回来
|
|
|
+ map.put("score", String.valueOf(wmTaskType.getScore() / 1000.0D));
|
|
|
+ } else {
|
|
|
+ map.put("score", String.valueOf(wmTaskType.getScore()));
|
|
|
+ }
|
|
|
+ return map;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ return R.ok(result);
|
|
|
+ }
|
|
|
+
|
|
|
+ return R.ok(Collections.emptyList());
|
|
|
+ }
|
|
|
|
|
|
}
|