hank.chen/FIC_Solar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

綜合報表月報

Browse Source 
發布錯誤修正
This commit is contained in:
b110212000 2022-03-01 13:55:52 +08:00
parent c7651dcd56
commit 36bf91da72
3 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SolarPower/Controllers/StationReportController.cs
View File

@ -1099,6 +1099,7 @@ namespace SolarPower.Controllers
var thour = ""; var tpr = ""; var tkwh = ""; var kWhkwp = ""; var ntd = ""; var ntdone = ""; var GeneratingCapacity = "";
foreach (dynamic body in Formbody.Result.Data)
{
index = 0;
var dbody = body as IDictionary<string, object>;
thour = Checknull(Math.Round(Convert.ToDouble(dbody["tothour"]), 2).ToString());

28
SolarPower/Quartz/Jobs/OperationScheduleJob.cs
View File

@ -2,6 +2,7 @@
using Newtonsoft.Json;
using Quartz;
using SolarPower.Models;
using SolarPower.Models.User;
using SolarPower.Repository.Interface;
using System;
using System.Collections.Generic;
@ -198,10 +199,25 @@ namespace SolarPower.Quartz.Jobs
#region 寄送日月報
var users = userRepository.GetAllAsync();
var ttt = new List<string>() {
"s506488@gmail.com",
"cesarliuc@gmail.com"
};
//var usertest = new List<User>();
//var oneuser = new User()
//{
// Account = "cesarliuc@gmail.com",
// Password = "np/F0eliIy3lPJe1tU18oiG7dzKRrpVw16/XZpHOph8=",
// Id = 13,
// Email = "cesarliuc@gmail.com",
// Status = 1,
// Name = "TEST"
//};
//usertest.Add(oneuser);
//var ttt = new List<string>() {
// "s506488@gmail.com",
// "cesarliuc@gmail.com"
//};
foreach (var user in users.Result)
{
@ -294,9 +310,9 @@ namespace SolarPower.Quartz.Jobs
{
Select_table2 maxmonthexcel = new Select_table2()
{
FormType = 0,
FormType = 1,
PowerStation = sentMaxpowerstations,
SearchType = 0,
SearchType = 1,
Time = DateTime.Now.AddDays(-1).ToString("yyyy-MM"),
Userid = user.Id
};

4
SolarPower/Repository/Implement/StationReportRepository.cs
View File

@ -393,7 +393,7 @@ namespace SolarPower.Repository.Implement
GROUP BY a.Id,a.time
) n ON n.Id = ps.Id
WHERE ps.Id IN @ids ORDER BY ps.CityId";
result = (await conn.QueryAsync<MaxFormbody>(sql,new { ids = ids})).ToList();
result = (await conn.QueryAsync<MaxFormbody>(sql,new { ids = ids}, commandTimeout: 300)).ToList();
}
catch (Exception exception)
{
@ -597,7 +597,7 @@ namespace SolarPower.Repository.Implement
break;
}
a = await conn.QueryAsync<dynamic>(sql);
a = await conn.QueryAsync<dynamic>(sql,commandTimeout: 300);
}
catch (Exception exception)
{