diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs index 8666fc4..6b428cd 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs @@ -3,6 +3,7 @@ using APT.BaseData.Domain.Entities.FM; using APT.BaseData.Domain.Entities.OP; using APT.BaseData.Domain.Enums; using APT.BaseData.Domain.IServices.FM; +using APT.BaseData.Domain.IServices.OP; using APT.BaseData.Services.Services.FM; using APT.BaseData.Services.Services.OP; using APT.Infrastructure.Api; @@ -39,6 +40,12 @@ namespace APT.SC.WebApi.Controllers.Api.BI [Route("api/BI/BIKanBanController")] public class BIKanBanController : APTApiController { + IOPTenantDBConnService OPTenantDBConnService { get; set; } + public BIKanBanController(IOPTenantDBConnService opTenantDBConnService) + { + OPTenantDBConnService = opTenantDBConnService; + } + /// /// 返回所有 /// @@ -241,6 +248,15 @@ namespace APT.SC.WebApi.Controllers.Api.BI DataTable tableJobRate = new DataTable(); DataTable tableSafeCheck = new DataTable(); DataTable tableLink = new DataTable(); + + //培训教育 对应统计 + var ListAllORG = GetEntities(e => !e.IS_DELETED && e.CODE != "003", null, null).OrderBy(e => e.TENANT_CODE).ToList(); + string strConn = OPTenantDBConnService.GetConnByORGID(filter.OrgId.Value);//获取数据库链接 + List listVNAME = new List() { "vhome_Train_Hour" };//, "vhome_risk_type_data" + DataSet ds = new DataSet(); + GETDBDATA(strConn, listVNAME, ref ds);//获取视图 数据 listVNAME 与 ds.Tables 一一对应 + result.Data.listSETrainSum = GetTrainInfo(ds.Tables[0], ListAllORG); + using (SqlConnection connection = new SqlConnection(connhead)) { try @@ -293,17 +309,6 @@ namespace APT.SC.WebApi.Controllers.Api.BI linkData.Fill(tableLink); result.Data.linkSum = linkSumData(connhead, tableLink); - - //培训教育 对应统计 - var ListAllORG = GetEntities(e => !e.IS_DELETED && e.CODE != "003", null, null).OrderBy(e => e.TENANT_CODE).ToList(); - string strConn = OPTenantDBConnService.GetConnByORGID(filter.OrgId.Value);//获取数据库链接 - List listVNAME = new List() { "vhome_Train_Hour" };//, "vhome_risk_type_data" - DataSet ds = new DataSet(); - GETDBDATA(strConn, listVNAME, ref ds);//获取视图 数据 listVNAME 与 ds.Tables 一一对应 - result.Data.listSETrainSum = GetTrainInfo(ds.Tables[0], ListAllORG); - - - connection.Close(); } catch (Exception ex)