|
|
@@ -2005,7 +2005,44 @@ public class EnergyService {
|
|
|
}
|
|
|
wrapper.orderByDesc(EnergyLog::getCreatedAt);
|
|
|
SortUtil.applySort(wrapper);
|
|
|
- return energyLogMapper.selectPage(pageParam, wrapper);
|
|
|
+ Page<EnergyLog> result = energyLogMapper.selectPage(pageParam, wrapper);
|
|
|
+ enrichLogDisplay(result.getRecords());
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 流水展示口径补齐(SC-P-18 能量流水查看 / 能力键 energy.ledger.view):
|
|
|
+ * 每条流水暴露可读来源名 {@code sourceName} 与维度代码 {@code dimensionCode},
|
|
|
+ * 使前端可直接展示来源、按维度着色/筛选,无需再查来源/维度表。
|
|
|
+ */
|
|
|
+ private void enrichLogDisplay(List<EnergyLog> logs) {
|
|
|
+ if (logs == null || logs.isEmpty()) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ for (EnergyLog log : logs) {
|
|
|
+ log.setSourceName(resolveSourceName(log.getSourceType()));
|
|
|
+ if (log.getDimensionId() != null) {
|
|
|
+ EnergyDimension dim = getDimById(log.getDimensionId());
|
|
|
+ if (dim != null) {
|
|
|
+ log.setDimensionCode(dim.getCode());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * sourceType → 可读来源名映射;未映射来源回退原始码,不抛错。
|
|
|
+ */
|
|
|
+ private String resolveSourceName(String sourceType) {
|
|
|
+ if (sourceType == null) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ switch (sourceType) {
|
|
|
+ case "task": return "完成任务";
|
|
|
+ case "health_checkin": return "健康打卡";
|
|
|
+ case "assessment": return "测评";
|
|
|
+ default: return sourceType;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|