huangge1199/iet-kpi-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

指标库：修复“获取原子指标配置(指标库列表中点击衍生)”

Browse Source
This commit is contained in:
huangge1199 2025-08-11 11:06:49 +08:00
parent bbcab977bd
commit db18f06c49
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/iet/ustb/sf/controller/TargetController.java
View File

@ -100,8 +100,7 @@ public class TargetController {
@Operation(summary = "获取原子指标配置(指标库列表中点击衍生)") @Operation(summary = "获取原子指标配置(指标库列表中点击衍生)")
@PostMapping("/getDetailExpandTarget") @PostMapping("/getDetailExpandTarget")
public R<JSONObject> getDetailExpandTarget(@RequestBody JSONObject params) { public R<JSONObject> getDetailExpandTarget(@RequestBody JSONObject params) {
JSONObject result; JSONObject result = targetService.getDetailExpandTarget(params);
result = targetService.getDetailExpandTarget(params);
Page<?> list = tableColumnService.getDataByTableName(result.getJSONObject("list")); Page<?> list = tableColumnService.getDataByTableName(result.getJSONObject("list"));
result.put("list", list); result.put("list", list);
result.put("columnList", tableColumnService.getColumnsByTableName(result.getString("tableName"))); result.put("columnList", tableColumnService.getColumnsByTableName(result.getString("tableName")));

6
src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java
View File

@ -456,9 +456,11 @@ public class TargetServiceImpl extends ServiceImpl<TargetMapper, Target>
CheckUtils.checkEmpty(id, "指标ID"); CheckUtils.checkEmpty(id, "指标ID");
target = targetMapper.selectById(id); target = targetMapper.selectById(id);
List<TargetOption> optionList = new ArrayList<>(); List<TargetOption> optionList = new ArrayList<>();
while (id != null) { Target parent = targetMapper.selectById(id);
while (!StringUtils.isEmpty(id)) {
optionList.addAll(0, targetOptionMapper.selectList(new QueryWrapper<TargetOption>().eq("target_id", id))); optionList.addAll(0, targetOptionMapper.selectList(new QueryWrapper<TargetOption>().eq("target_id", id)));
id = target.getParent(); id = parent.getParent();
parent = targetMapper.selectById(id);
} }
return getDetailTarget(optionList, target); return getDetailTarget(optionList, target);
} }