fix: 发布时间用reviewedAt替代createdAt+保存时间用updatedAt+DTO补充字段
This commit is contained in:
@@ -20,7 +20,7 @@ public class SiteAccessSummaryDTO {
|
|||||||
private int uncheckedCount;
|
private int uncheckedCount;
|
||||||
private int pendingConfigCount;
|
private int pendingConfigCount;
|
||||||
private LocalDateTime lastSubmitted;
|
private LocalDateTime lastSubmitted;
|
||||||
private LocalDateTime configUpdatedAt;
|
private LocalDateTime configSavedAt;
|
||||||
private LocalDateTime configPublishedAt;
|
private LocalDateTime configPublishedAt;
|
||||||
private List<AccessPageSummaryDTO> pages;
|
private List<AccessPageSummaryDTO> pages;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,4 +20,5 @@ public class SiteConfigDTO {
|
|||||||
private Long submitterId;
|
private Long submitterId;
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
private LocalDateTime updatedAt;
|
private LocalDateTime updatedAt;
|
||||||
|
private LocalDateTime reviewedAt;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -170,8 +170,8 @@ public class AccessResultServiceImpl implements AccessResultService {
|
|||||||
SiteConfig latest = siteConfigMapper.selectLatestBySiteId(k);
|
SiteConfig latest = siteConfigMapper.selectLatestBySiteId(k);
|
||||||
if (latest != null) {
|
if (latest != null) {
|
||||||
s.setLatestVersion(latest.getVersion());
|
s.setLatestVersion(latest.getVersion());
|
||||||
s.setConfigUpdatedAt(latest.getUpdatedAt());
|
s.setConfigSavedAt(latest.getUpdatedAt());
|
||||||
s.setConfigPublishedAt(latest.getCreatedAt());
|
s.setConfigPublishedAt(latest.getReviewedAt());
|
||||||
}
|
}
|
||||||
return s;
|
return s;
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -88,6 +88,7 @@ public class ConfigServiceImpl implements ConfigService {
|
|||||||
dto.setSubmitterId(config.getSubmitterId());
|
dto.setSubmitterId(config.getSubmitterId());
|
||||||
dto.setCreatedAt(config.getCreatedAt());
|
dto.setCreatedAt(config.getCreatedAt());
|
||||||
dto.setUpdatedAt(config.getUpdatedAt());
|
dto.setUpdatedAt(config.getUpdatedAt());
|
||||||
|
dto.setReviewedAt(config.getReviewedAt());
|
||||||
return dto;
|
return dto;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,16 +24,17 @@
|
|||||||
<span>{{ scope.row.pages?.length || 0 }}页·{{ scope.row.totalResults || 0 }}次</span>
|
<span>{{ scope.row.pages?.length || 0 }}页·{{ scope.row.totalResults || 0 }}次</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="更新 / 发布" width="180">
|
<el-table-column label="脚本" width="160">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span v-if="scope.row.configUpdatedAt" style="font-size:12px;color:#909399">
|
<span v-if="scope.row.configSavedAt" style="font-size:12px;color:#909399">
|
||||||
{{ friendlyTime(scope.row.configUpdatedAt) }}
|
保存: {{ friendlyTime(scope.row.configSavedAt) }}
|
||||||
</span>
|
</span>
|
||||||
<span v-else style="font-size:12px;color:#909399">-</span>
|
<span v-else style="font-size:12px;color:#909399">未保存</span>
|
||||||
<br>
|
<br>
|
||||||
<span v-if="scope.row.configPublishedAt" style="font-size:12px;color:#909399">
|
<span v-if="scope.row.configPublishedAt" style="font-size:12px;color:#909399">
|
||||||
{{ friendlyTime(scope.row.configPublishedAt) }}
|
发布: {{ friendlyTime(scope.row.configPublishedAt) }}
|
||||||
</span>
|
</span>
|
||||||
|
<span v-else style="font-size:12px;color:#909399">未发布</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="待审核" width="70" align="center">
|
<el-table-column label="待审核" width="70" align="center">
|
||||||
|
|||||||
Reference in New Issue
Block a user