From f349b7ddc7cdb94e05c1085123c6d75cb95e469c 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: Mon, 25 May 2026 16:21:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=8D=B1=E9=99=A9=E4=BD=9C?=
 =?UTF-8?q?=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    | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 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 d1ee2a6..69f85c1 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs
@@ -25,6 +25,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Data.SqlClient;
 using MySqlX.XDevAPI.Common;
 using NPOI.SS.Formula.Functions;
+using NPOI.Util;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -109,7 +110,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
         public class JobTodayQty
         {
             public int qty { get; set; }
-            public Guid workTypeId { get; set; }
+            public Guid? workTypeId { get; set; }
 
             public string name { get; set; }
         }
@@ -1055,11 +1056,11 @@ namespace APT.SC.WebApi.Controllers.Api.BI
                     }
                     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);
+                    //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)
@@ -1069,6 +1070,24 @@ namespace APT.SC.WebApi.Controllers.Api.BI
                     else
                         throw new Exception("【" + HttpContext.Request.Path + "】错误日志：[Message]" + ex.Message);
                 }
+                List<JobTodayQty> jobTodayQtys = new List<JobTodayQty>();
+                if (list != null && list.Any())
+                { 
+                    var groupBy = list.GroupBy(t=>t.jobName);
+                    if (groupBy != null && groupBy.Any())
+                    {
+                        foreach (var item in groupBy)
+                        {
+                            jobTodayQtys.Add(new JobTodayQty()
+                            {
+                                qty = item.Count(),
+                                workTypeId = null,
+                                name = item.Key.ToString(),
+                            });
+                        }
+                    }
+                }
+                result.Data.jobTodayQty = jobTodayQtys.ToList();
             }
             return result;