diff --git a/SolarPower/Repository/Implement/OverviewRepository.cs b/SolarPower/Repository/Implement/OverviewRepository.cs index c388607..daf943d 100644 --- a/SolarPower/Repository/Implement/OverviewRepository.cs +++ b/SolarPower/Repository/Implement/OverviewRepository.cs @@ -423,7 +423,7 @@ namespace SolarPower.Repository.Implement join alarmorion_orionalarmclass b on a.alarmclass = b.id left join ref_err_device c on trim(b.alarmClass) = c.deviceType left join ref_err_inv d on lower(b.alarmClass) = d.deviceType - and case when lower(b.alarmClass) = 'inverter' and err_valuekind = 'e' then errvalue else '' end = d.errCode + # and case when lower(b.alarmClass) = 'inverter' and err_valuekind = 'e' then errvalue else '' end = d.errCode left join power_station ps on ps.Code = site_id left join operation_record pr on pr.ErrorCode = a.id WHERE a.sourceState = @Status AND ps.Id IN @PowerStationId"; @@ -440,6 +440,8 @@ namespace SolarPower.Repository.Implement sql += @$" AND `timestamp` BETWEEN {startime * 1000} AND {endtime * 1000}"; } + sql += "order by errvalue "; + result = (await conn.QueryAsync(sql, new {