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
///
///
[HttpPost, Route("SubCertificateType")]
- public JsonActionResult> SubCertificateType([FromBody] KeywordFilter filter)
+ public JsonActionResult>> 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 listCerName = result.Select(e => e.NAME).Distinct().ToList();
+ List listCN = new List();
+ foreach (DataRow item in tbC.Rows)
+ {
+ listCN.Add(item["NAME"].ToString());
+ }
+
+ List> listResult = new List>();
+ List listT = new List();
+ listT.Add("公司");
+ listT.AddRange(listCerName);
+ listT.Add("小计");
+ listResult.Add(listT);
+ List listD = null;
+ int PerSum = 0;
+ foreach (var item in listCN)
+ {
+ listD = new List();
+ 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;
});
}
-
}
///