Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower
This commit is contained in:
commit
1ecb54e7e0
@ -129,7 +129,7 @@ namespace solarApp.Service
|
||||
|
||||
string sql = @" select id as PowerStationID from solar_master.power_station where `code` = @siteID";
|
||||
var ds = conn.Query<string>(sql, new { siteID = _siteID }).AsList<string>();
|
||||
_powerStationID = (ds.Count > 0) ? ds[0][0].ToString() : "0";
|
||||
_powerStationID = (ds.Count > 0) ? ds[0].ToString() : "0";
|
||||
|
||||
#region hour -- solar_type 計費類別:0 自建、1 租建、2自建 ------------ 1 租建計算方式 後再再補上
|
||||
|
||||
@ -187,7 +187,7 @@ namespace solarApp.Service
|
||||
GROUP BY lb.PowerStationId
|
||||
) c ON a.siteID = c.siteID
|
||||
where FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d') = @date1 and a.SITEID = @siteID ";
|
||||
int ct = conn.Execute(sql, new { date1 = _date1, siteID = _siteID });
|
||||
//int ct = conn.Execute(sql, new { date1 = _date1, siteID = _siteID });
|
||||
|
||||
#endregion hour
|
||||
|
||||
@ -229,7 +229,7 @@ namespace solarApp.Service
|
||||
WHERE ps.Code = @siteID
|
||||
GROUP BY lb.PowerStationId
|
||||
) c ON a.siteID = c.siteID";
|
||||
conn.Execute(sql, new { date1 = _date1, siteID = _siteID });
|
||||
//conn.Execute(sql, new { date1 = _date1, siteID = _siteID });
|
||||
#endregion day
|
||||
|
||||
#region month
|
||||
|
||||
Loading…
Reference in New Issue
Block a user