From 9428cc1ef3bdaa4026ac8eaf2c22cf8d2779bc41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <991152047@qq.com>
Date: Tue, 2 Apr 2024 11:04:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8A=A5=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BIStatiscialAnalysisController.cs         | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
index 89bd6d9..784f07d 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
@@ -7146,9 +7146,41 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
         {
             return SafeExecute<List<T_BI_DEPARTMENT_MONTH_RUN>>(() =>
             {
+                if (string.IsNullOrEmpty(filter.Parameter1) || string.IsNullOrEmpty(filter.Parameter2))
+                {
+                    throw new Exception("请先选择时间段");
+                }
+                if (string.IsNullOrEmpty(filter.Keyword))
+                {
+                    throw new Exception("请先选择部门");
+                }
+                DateTime startTime = Convert.ToDateTime(filter.Parameter1);
+                DateTime endTime = Convert.ToDateTime(filter.Parameter2);
+                var diffTime = startTime.AddMonths(12).Date;
+                if (diffTime < endTime.Date)
+                {
+                    throw new Exception("查询时间不能超过12个月!");
+                }
+                //int type = 1;
+                //if (dayDidd <= 31)
+                //{
+                //    type = 5;//最近一周(显示最近一月的，最小单位为月)
+                //}
+                //if (dayDidd > 31 && dayDidd<=90)
+                //{
+                //    type = 10;//最近三月
+                //}
+                //if (dayDidd > 90 && dayDidd <= 180)
+                //{
+                //    type = 15;//最近半年
+                //}
+                //if (dayDidd > 180)
+                //{
+                //    type = 20;//最近一年
+                //}
                 List<T_BI_DEPARTMENT_MONTH_RUN> completionLists = new List<T_BI_DEPARTMENT_MONTH_RUN>();
                 var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId.Value;
-                var completions = GetEntities<T_BI_DEPARTMENT_MONTH_RUN>(t => !t.IS_DELETED, filter).OrderBy(m=>m.MONTH).ToList();
+                var completions = GetEntities<T_BI_DEPARTMENT_MONTH_RUN>(t => !t.IS_DELETED && t.DEPARTMENT_NAME == filter.Keyword && t.MONTH >= startTime && t.MONTH < endTime, new BaseFilter(filter.OrgId)).OrderBy(m => m.MONTH).ToList();
                 if (completions != null && completions.Any())
                 {
                     foreach (var item in completions)