Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

安徽测试报告整改

Browse Source
This commit is contained in:
xy
2024-12-07 13:42:39 +08:00
parent da3e897fc2
commit ea70f0fc2c
5 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
View File

@@ -966,12 +966,21 @@ public class CustomReportServiceImpl implements CustomReportService {
if (Objects.nonNull(finalTerminalMap)) {
if ("statis_time".equals(tem)) {
//如何时间是大于当前时间则用当前时间
// String localTime = InfluxDbSqlConstant.END_TIME;
// LocalDate localDate = LocalDateTimeUtil.parseDate(reportSearchParam.getEndTime(), DatePattern.NORM_DATE_PATTERN);
// if(LocalDate.now().isEqual(localDate)){
// localTime =" "+ LocalTime.now().format(DatePattern.NORM_TIME_FORMATTER);
// }
// son.set("v", reportSearchParam.getStartTime() + InfluxDbSqlConstant.START_TIME + "_" + reportSearchParam.getEndTime() + localTime);
String localTime = InfluxDbSqlConstant.END_TIME;
LocalDate localDate = LocalDateTimeUtil.parseDate(reportSearchParam.getEndTime(), DatePattern.NORM_DATE_PATTERN);
if(LocalDate.now().isEqual(localDate)){
LocalDate nowDate = LocalDate.now();
if (nowDate.isAfter(localDate)) {
son.set("v", reportSearchParam.getStartTime() + InfluxDbSqlConstant.START_TIME + "_" + reportSearchParam.getEndTime() + localTime);
} else {
localTime =" "+ LocalTime.now().format(DatePattern.NORM_TIME_FORMATTER);
son.set("v", reportSearchParam.getStartTime() + InfluxDbSqlConstant.START_TIME + "_" + nowDate + localTime);
}
son.set("v", reportSearchParam.getStartTime() + InfluxDbSqlConstant.START_TIME + "_" + reportSearchParam.getEndTime() + localTime);
} else {
//台账信息
son.set("v", finalTerminalMap.getOrDefault(tem, "/"));