From ddabeb763ad815dc9b308061b46983a210c88f67 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Thu, 23 Apr 2026 14:53:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=81=E4=BB=B6=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/BIController/BIHeadSEController.cs    | 38 +++++++++++++++++--
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHeadSEController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHeadSEController.cs
index 04c8849..2e5239d 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHeadSEController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHeadSEController.cs
@@ -229,7 +229,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
                     }
                     else
                     {
-                        dic.Add("@dtMax", dtSecrch.AddYears(1).AddSeconds(-1));
+                        dic.Add("@dtMax", dtSecrch.AddMonths(1).AddSeconds(-1));
                     }
                 }
                 else
@@ -551,7 +551,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
         /// </summary>
         /// <param name="filter"></param>
         [HttpPost, Route("SubCertificateType")]
-        public JsonActionResult<List<CertificateType>> SubCertificateType([FromBody] KeywordFilter filter)
+        public JsonActionResult<List<List<string>>> SubCertificateType([FromBody] KeywordFilter filter)
         {
             return SafeExecute(() =>
             {
@@ -576,6 +576,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
                 DataSet ds = DBHelper.ExecProcedure(strConn, "proc_HomeSESubCertificateType", dic, HttpContext.Request.Path);
 
                 DataTable tb = ds.Tables[0];
+                DataTable tbC = ds.Tables[1];
                 int Count = 0;
                 int RCount = tb.Rows.Count;
                 CertificateType mode = null;
@@ -595,10 +596,39 @@ namespace APT.SC.WebApi.Controllers.Api.BI
                     mode.TCOUNT = Count;
                     result.Add(mode);
                 }
-                return result;
+
+                List<string> listCerName = result.Select(e => e.NAME).Distinct().ToList();
+                List<string> listCN = new List<string>();
+                foreach (DataRow item in tbC.Rows)
+                {
+                    listCN.Add(item["NAME"].ToString());
+                }
+
+                List<List<string>> listResult = new List<List<string>>();
+                List<string> listT = new List<string>();
+                listT.Add("公司");
+                listT.AddRange(listCerName);
+                listT.Add("小计");
+                listResult.Add(listT);
+                List<string> listD = null;
+                int PerSum = 0;
+                foreach (var item in listCN)
+                {
+                    listD = new List<string>();
+                    PerSum = 0;
+                    listD.Add(item);
+                    foreach (var itemCerName in listCerName)
+                    {
+                        mode = result.FirstOrDefault(e => e.NAME == itemCerName && e.CNAME == item);
+                        PerSum += (mode == null ? 0 : mode.TCOUNT);
+                        listD.Add(mode == null ? "0" : mode.TCOUNT.ToString());
+                    }
+                    listD.Add(PerSum.ToString());
+                    listResult.Add(listD);
+                }
+                return listResult;
             });
         }
-
     }
 
     /// <summary>