From b0f60f4a582d70135d306041c5c5c71152f4328f Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 30 Oct 2023 16:30:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=A9=E6=95=88=E8=80=83?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CQMS/Performance/Performance.aspx.cs      | 19 ++++++++++++++++---
 .../CQMS/Performance/PerformanceEdit.aspx.cs  |  8 ++++++--
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/SGGL/FineUIPro.Web/CQMS/Performance/Performance.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Performance/Performance.aspx.cs
index d3f25dcc..f154a7de 100644
--- a/SGGL/FineUIPro.Web/CQMS/Performance/Performance.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Performance/Performance.aspx.cs
@@ -122,14 +122,18 @@ namespace FineUIPro.Web.CQMS.Performance
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
                 var NowDate = Convert.ToDateTime(drpCompileDateMonth.Text.Trim());
+                var Year = NowDate.Year;
                 var Month = 1;
                 if (NowDate.Month != 12)
                 {
                     Month = NowDate.Month + 1;
                 }
+                else {
+                    Year += 1;
+                }
 
                 //获取配置
-                var modelConfig = Funs.DB.CQMS_Performance_SetUp.FirstOrDefault(x => x.CreateYear == NowDate.Year.ToString() && x.SortIndex == Month);
+                var modelConfig = Funs.DB.CQMS_Performance_SetUp.FirstOrDefault(x => x.CreateYear == Year.ToString() && x.SortIndex == Month);
                 if (modelConfig != null)
                 {
                     int child3Index = 1;
@@ -1063,13 +1067,17 @@ namespace FineUIPro.Web.CQMS.Performance
                     //循环list给每周任务、工程量、资源需求计划、本周工作任务完成情况 ,每日工作计划、完成情况赋值
                     //获取周数
                     var NowDate = Convert.ToDateTime(drpCompileDateMonth.Text.Trim());
+                    var Year = NowDate.Year;
                     var Month = 1;
                     if (NowDate.Month != 12)
                     {
                         Month = NowDate.Month + 1;
                     }
+                    else {
+                        Year += 1;
+                    }
 
-                    var modelConfig = Funs.DB.CQMS_Performance_SetUp.FirstOrDefault(x => x.CreateYear == NowDate.Year.ToString() && x.SortIndex == Month);
+                    var modelConfig = Funs.DB.CQMS_Performance_SetUp.FirstOrDefault(x => x.CreateYear == Year.ToString() && x.SortIndex == Month);
 
                     for (int i = 0; i < listChild1.Count; i++)
                     {
@@ -1238,14 +1246,19 @@ namespace FineUIPro.Web.CQMS.Performance
                 return;
             }
             var dates = Convert.ToDateTime(drpCompileDateMonth.Text.Trim());
+            var Year = dates.Year;
             var Month = 1;
             if (dates.Month != 12)
             {
                 Month = dates.Month + 1;
             }
+            else
+            {
+                Year += 1;
+            }
 
             //按照日期查询是否有设置
-            var modelConfig = Funs.DB.CQMS_Performance_SetUp.FirstOrDefault(x => x.CreateYear == dates.Year.ToString() && x.SortIndex == Month);
+            var modelConfig = Funs.DB.CQMS_Performance_SetUp.FirstOrDefault(x => x.CreateYear == Year.ToString() && x.SortIndex == Month);
             if (modelConfig == null)
             {
                 ShowNotify("当前日期未设置规则，请前往施工绩效设置页面进行操作。", MessageBoxIcon.Warning);
diff --git a/SGGL/FineUIPro.Web/CQMS/Performance/PerformanceEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Performance/PerformanceEdit.aspx.cs
index 4fdc1f81..d21682c9 100644
--- a/SGGL/FineUIPro.Web/CQMS/Performance/PerformanceEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Performance/PerformanceEdit.aspx.cs
@@ -468,14 +468,18 @@ namespace FineUIPro.Web.CQMS.Performance
                     #endregion
                     var datesConfig = Convert.ToDateTime(drpCompileDateMonth.Text.Trim());
                     var Month = 1;
+                    var nowYear = datesConfig.Year;
                     if (datesConfig.Month != 12)
                     {
-                        Month = datesConfig.Month+ 1;
+                        Month = datesConfig.Month + 1;
+                    }
+                    else {
+                        nowYear += 1;
                     }
 
                     var Child2SortIndex = 1;
                     //按照日期查询是否有设置
-                    var modelConfig = Funs.DB.CQMS_Performance_SetUp.FirstOrDefault(x => x.CreateYear == datesConfig.Year.ToString() && x.SortIndex == Month);
+                    var modelConfig = Funs.DB.CQMS_Performance_SetUp.FirstOrDefault(x => x.CreateYear == nowYear.ToString() && x.SortIndex == Month);
                     if (modelConfig!=null)
                     {
                         //根据设置的周数插入表格CQMS_Performance_Child2