diff --git a/04.系统编码/DAL/ComputeDAL.cs b/04.系统编码/DAL/ComputeDAL.cs index 72aeb5a..7868e84 100644 --- a/04.系统编码/DAL/ComputeDAL.cs +++ b/04.系统编码/DAL/ComputeDAL.cs @@ -18,7 +18,7 @@ namespace Pingchuan.BeijingSafeguard.DAL public static Pagination UserStatistics(DateTime fromTime, DateTime toTime, int pageIndex, int pageSize) { - string sql = $@"select temp.*, u.real_name user_name, o.id org_id, o.name org_name from ( + string sql = $@"select temp.*, u.real_name user_name, o.id org_id, o.name org_name, o.name org_name2 from ( select user_id, count(*) compute_count, max(create_time) last_compute_time from computes where create_time >= @0 and create_time < @1 group by user_id) temp @@ -30,7 +30,7 @@ namespace Pingchuan.BeijingSafeguard.DAL public static Pagination OrgStatistics(DateTime fromTime, DateTime toTime, int pageIndex, int pageSize) { - string sql = $@"select temp.*, o.name org_name from ( + string sql = $@"select temp.*, o.name org_name, o.name org_name2 from ( select org_id, count(*) compute_count, max(create_time) last_compute_time from computes where create_time >= @0 and create_time < @1 group by org_id) temp diff --git a/04.系统编码/Model/Statistic.cs b/04.系统编码/Model/Statistic.cs index 2e042b3..e3ad4e2 100644 --- a/04.系统编码/Model/Statistic.cs +++ b/04.系统编码/Model/Statistic.cs @@ -17,6 +17,9 @@ namespace Pingchuan.BeijingSafeguard.Model [Column("org_name")] public string OrgName { get; set; } + [Column("org_name2")] + public string OrgName2 { get; set; } + [Column("compute_count")] public int ComputeCount { get; set; }