From 21e3451b3cfffd9469606c8abc5c2f4f8d59b4b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Thu, 21 May 2026 10:39:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api/BIController/BIKanBanController.cs | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) 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 ee2c15b..01bb903 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs @@ -1008,6 +1008,24 @@ namespace APT.SC.WebApi.Controllers.Api.BI [HttpPost, Route("JobManage")] public JsonActionResult> JobManage([FromBody] KeywordFilter filter) { + DateTime startDate = DateTime.Now.Date; + DateTime endDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59")); + if (!string.IsNullOrEmpty(filter.Parameter1)) + { + startDate = Convert.ToDateTime(filter.Parameter1).Date; + } + if (!string.IsNullOrEmpty(filter.Parameter2)) + { + endDate = Convert.ToDateTime(Convert.ToDateTime(filter.Parameter2).Date.ToString("yyyy-MM-dd 23:59:59")); + } + if (startDate.Year != DateTime.Now.Year) + { + throw new Exception("只能查询本年度数据，请修改开始时间！"); + } + if (endDate.Year != DateTime.Now.Year) + { + throw new Exception("只能查询本年度数据，请修改结束时间！"); + } JsonActionResult> result = new JsonActionResult>(); var list = new List(); DataTable tableList = new DataTable(); @@ -1016,9 +1034,10 @@ namespace APT.SC.WebApi.Controllers.Api.BI { try { + connection.Open(); //当日危险作业清单 - string sql = "select * from vhome_jobTodayList"; + string sql = "select * from vhome_jobTodayList where create_time >="+ startDate + "and create_time<="+ endDate; SqlCommand com = new SqlCommand(sql, connection); SqlDataAdapter data = new SqlDataAdapter(com); data.Fill(tableList); From 22309251f2baaab6dba6c351e6a4ae383126f12e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Thu, 21 May 2026 11:44:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api/BIController/BIKanBanController.cs | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) 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 01bb903..c9d151d 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs @@ -283,7 +283,24 @@ namespace APT.SC.WebApi.Controllers.Api.BI DataTable tableJobRate = new DataTable(); DataTable tableSafeCheck = new DataTable(); DataTable tableLink = new DataTable(); - + DateTime startDate = DateTime.Now.Date; + DateTime endDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59")); + if (!string.IsNullOrEmpty(filter.Parameter1)) + { + startDate = Convert.ToDateTime(filter.Parameter1).Date; + } + if (!string.IsNullOrEmpty(filter.Parameter2)) + { + endDate = Convert.ToDateTime(Convert.ToDateTime(filter.Parameter2).Date.ToString("yyyy-MM-dd 23:59:59")); + } + if (startDate.Year != DateTime.Now.Year) + { + throw new Exception("只能查询本年度数据，请修改开始时间！"); + } + if (endDate.Year != DateTime.Now.Year) + { + throw new Exception("只能查询本年度数据，请修改结束时间！"); + } //培训教育 对应统计 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);//获取数据库链接 @@ -313,7 +330,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI //jobGroupData.Fill(tableJobGroup); //result.Data.jobTodayTop3 = JobTodayTopData(filter.OrgId.Value, tableJob, tableJobGroup); //当日工作票的统计数量 - string sqlJob = "select * from vhome_jobToday ORDER BY NUM"; + string sqlJob = "select name,count(*) as qty from vhome_jobTodayNew where create_time >=" + startDate + "and create_time<=" + endDate + " GROUP BY name ORDER BY qty desc"; SqlCommand comJob = new SqlCommand(sqlJob, connection); SqlDataAdapter jobData = new SqlDataAdapter(comJob); jobData.Fill(tableJob); From 85bcce9e05cbbf6a8df60c01719aca96e6cef7d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Thu, 21 May 2026 11:53:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/BIController/BIKanBanController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c9d151d..bc440d5 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs @@ -330,7 +330,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI //jobGroupData.Fill(tableJobGroup); //result.Data.jobTodayTop3 = JobTodayTopData(filter.OrgId.Value, tableJob, tableJobGroup); //当日工作票的统计数量 - string sqlJob = "select name,count(*) as qty from vhome_jobTodayNew where create_time >=" + startDate + "and create_time<=" + endDate + " GROUP BY name ORDER BY qty desc"; + string sqlJob = "select WORK_PERMIT_TYPE_ID,NAME,count(*) as QTY from vhome_jobTodayNew where create_time >=" + startDate + "and create_time<=" + endDate + " GROUP BY WORK_PERMIT_TYPE_ID,NAME ORDER BY qty desc"; SqlCommand comJob = new SqlCommand(sqlJob, connection); SqlDataAdapter jobData = new SqlDataAdapter(comJob); jobData.Fill(tableJob); From e908f317411a6871af33ee77fcac3e856b9e6db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Thu, 21 May 2026 11:54:53 +0800 Subject: [PATCH 4/5] 2 --- .../Controllers/Api/BIController/BIKanBanController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bc440d5..0634644 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs @@ -330,7 +330,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI //jobGroupData.Fill(tableJobGroup); //result.Data.jobTodayTop3 = JobTodayTopData(filter.OrgId.Value, tableJob, tableJobGroup); //当日工作票的统计数量 - string sqlJob = "select WORK_PERMIT_TYPE_ID,NAME,count(*) as QTY from vhome_jobTodayNew where create_time >=" + startDate + "and create_time<=" + endDate + " GROUP BY WORK_PERMIT_TYPE_ID,NAME ORDER BY qty desc"; + string sqlJob = "select WORK_PERMIT_TYPE_ID,NAME,count(*) as QTY from vhome_jobTodayNew where create_time >=" + startDate + "and create_time<=" + endDate + " GROUP BY WORK_PERMIT_TYPE_ID,NAME ORDER BY QTY DESC"; SqlCommand comJob = new SqlCommand(sqlJob, connection); SqlDataAdapter jobData = new SqlDataAdapter(comJob); jobData.Fill(tableJob); From c2026be505edc7a9f676adfc2873dfeb0b06b50f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Thu, 21 May 2026 15:09:28 +0800 Subject: [PATCH 5/5] 1 --- .../Api/BIController/BIKanBanController.cs | 57 +++++++++---------- 1 file changed, 26 insertions(+), 31 deletions(-) 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 0634644..d1ee2a6 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs @@ -276,31 +276,12 @@ namespace APT.SC.WebApi.Controllers.Api.BI JsonActionResult result = new JsonActionResult(); result.Data = new ReturnAll(); DataTable tableRisk = new DataTable(); - DataTable tableJob = new DataTable(); DataTable tableJobGroup = new DataTable(); DataTable tableHidden = new DataTable(); DataTable tableTask = new DataTable(); DataTable tableJobRate = new DataTable(); DataTable tableSafeCheck = new DataTable(); DataTable tableLink = new DataTable(); - DateTime startDate = DateTime.Now.Date; - DateTime endDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59")); - if (!string.IsNullOrEmpty(filter.Parameter1)) - { - startDate = Convert.ToDateTime(filter.Parameter1).Date; - } - if (!string.IsNullOrEmpty(filter.Parameter2)) - { - endDate = Convert.ToDateTime(Convert.ToDateTime(filter.Parameter2).Date.ToString("yyyy-MM-dd 23:59:59")); - } - if (startDate.Year != DateTime.Now.Year) - { - throw new Exception("只能查询本年度数据，请修改开始时间！"); - } - if (endDate.Year != DateTime.Now.Year) - { - throw new Exception("只能查询本年度数据，请修改结束时间！"); - } //培训教育 对应统计 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);//获取数据库链接 @@ -329,12 +310,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI //SqlDataAdapter jobGroupData = new SqlDataAdapter(comJobGroup); //jobGroupData.Fill(tableJobGroup); //result.Data.jobTodayTop3 = JobTodayTopData(filter.OrgId.Value, tableJob, tableJobGroup); - //当日工作票的统计数量 - string sqlJob = "select WORK_PERMIT_TYPE_ID,NAME,count(*) as QTY from vhome_jobTodayNew where create_time >=" + startDate + "and create_time<=" + endDate + " GROUP BY WORK_PERMIT_TYPE_ID,NAME ORDER BY QTY DESC"; - SqlCommand comJob = new SqlCommand(sqlJob, connection); - SqlDataAdapter jobData = new SqlDataAdapter(comJob); - jobData.Fill(tableJob); - result.Data.jobTodayQty = JobTodayQtyData(tableJob); + //隐患统计数据 string sqlHidden = "select * from vhome_hiddenSummary"; SqlCommand comHidden = new SqlCommand(sqlHidden, connection); @@ -1023,7 +999,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI /// /// [HttpPost, Route("JobManage")] - public JsonActionResult> JobManage([FromBody] KeywordFilter filter) + public JsonActionResult JobManage([FromBody] KeywordFilter filter) { DateTime startDate = DateTime.Now.Date; DateTime endDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59")); @@ -1043,9 +1019,11 @@ namespace APT.SC.WebApi.Controllers.Api.BI { throw new Exception("只能查询本年度数据，请修改结束时间！"); } - JsonActionResult> result = new JsonActionResult>(); - var list = new List(); + JsonActionResult result = new JsonActionResult(); + result.Data = new JobManage(); + var list = new List(); DataTable tableList = new DataTable(); + DataTable tableJob = new DataTable(); string strConn = OPTenantDBConnService.GetConnByORGID(filter.OrgId.Value);//获取数据库链接 using (SqlConnection connection = new SqlConnection(strConn)) { @@ -1054,7 +1032,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI connection.Open(); //当日危险作业清单 - string sql = "select * from vhome_jobTodayList where create_time >="+ startDate + "and create_time<="+ endDate; + string sql = "select * from vhome_jobTodayList where create_time >='"+ startDate +"' and create_time<='" + endDate+"'"; SqlCommand com = new SqlCommand(sql, connection); SqlDataAdapter data = new SqlDataAdapter(com); data.Fill(tableList); @@ -1062,7 +1040,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI { foreach (DataRow item in tableList.Rows) { - JobManage job = new JobManage(); + JobList job = new JobList(); job.companyName = item["companyName"] != null ? item["companyName"].ToString() : null; job.startDate = item["JOB_DATE"] != null ? item["JOB_DATE"].ToString() : null; job.endDate = item["JOB_END_DATE"] != null ? item["JOB_END_DATE"].ToString() : null; @@ -1075,6 +1053,13 @@ namespace APT.SC.WebApi.Controllers.Api.BI list.Add(job); } } + result.Data.jobList = list.ToList(); + //当日工作票的统计数量 + string sqlJob = "select WORK_PERMIT_TYPE_ID,NAME,count(*) as QTY from vhome_jobTodayNew where create_time >='" + startDate + "' and create_time<='" + endDate + "' GROUP BY WORK_PERMIT_TYPE_ID,NAME ORDER BY QTY DESC"; + SqlCommand comJob = new SqlCommand(sqlJob, connection); + SqlDataAdapter jobData = new SqlDataAdapter(comJob); + jobData.Fill(tableJob); + result.Data.jobTodayQty = JobTodayQtyData(tableJob); connection.Close(); } catch (Exception ex) @@ -1085,7 +1070,6 @@ namespace APT.SC.WebApi.Controllers.Api.BI throw new Exception("【" + HttpContext.Request.Path + "】错误日志：[Message]" + ex.Message); } } - result.Data = list; return result; } @@ -1177,6 +1161,17 @@ namespace APT.SC.WebApi.Controllers.Api.BI public int? qty { get; set; } } public class JobManage + { + /// + /// 作业清单 + /// + public List jobList { get; set; } + /// + /// + /// + public List jobTodayQty { get; set; } + } + public class JobList { /// /// 公司名称