20250616 评价报告导出增加上传日期

CreateModel.bat

@@ -27,7 +27,7 @@ REM --------------
 @echo.
 @call "%VS100COMNTOOLS%"vsvars32.bat
 
-SqlMetal /views  /server:.\SQL2016 /database:FCLDB /code:%Model_ROOT%\Model.cs /namespace:Model
+SqlMetal /views  /server:.\SQL2022 /database:FCLDB /code:%Model_ROOT%\Model.cs /namespace:Model
 
 @ECHO 完成
 pause

FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs

@@ -2120,6 +2120,8 @@ namespace FineUIPro.Web.Evaluation
                     ws.GetRow(rowIndex).GetCell(24).SetCellValue(p.SES_No);
                     if (ws.GetRow(rowIndex).GetCell(25) == null) ws.GetRow(rowIndex).CreateCell(25);
                     ws.GetRow(rowIndex).GetCell(25).SetCellValue(p.CompletionDate != null ? p.CompletionDate.Value.ToString("yyyy/MM/dd") : "");
+                    if (ws.GetRow(rowIndex).GetCell(26) == null) ws.GetRow(rowIndex).CreateCell(26);
+                    ws.GetRow(rowIndex).GetCell(26).SetCellValue(p.CreateDate != null ? p.CreateDate.Value.ToString("yyyy/MM/dd") : "");
 
                     if ((int)(90 * (rowIndex) / totalNum) > percent)
                     {
@@ -2244,6 +2246,8 @@ namespace FineUIPro.Web.Evaluation
                     wsCm.GetRow(rowIndex).GetCell(14).SetCellValue(p.User_Representative);
                     if (wsCm.GetRow(rowIndex).GetCell(15) == null) wsCm.GetRow(rowIndex).CreateCell(15);
                     wsCm.GetRow(rowIndex).GetCell(15).SetCellValue(p.BycDept);
+                    if (wsCm.GetRow(rowIndex).GetCell(16) == null) wsCm.GetRow(rowIndex).CreateCell(16);
+                    wsCm.GetRow(rowIndex).GetCell(16).SetCellValue(p.UploadDate != null ? p.UploadDate.Value.ToString("yyyy/MM/dd") : "");
 
                     if ((int)((90 * (rowIndex + punishCount )) / totalNum) > percent)
                     {
@@ -2910,6 +2914,8 @@ namespace FineUIPro.Web.Evaluation
                     ws.GetRow(rowIndex).GetCell(24).SetCellValue(p.SES_No);
                     if (ws.GetRow(rowIndex).GetCell(25) == null) ws.GetRow(rowIndex).CreateCell(25);
                     ws.GetRow(rowIndex).GetCell(25).SetCellValue(p.CompletionDate != null ? p.CompletionDate.Value.ToString("yyyy/MM/dd") : "");
+                    if (ws.GetRow(rowIndex).GetCell(26) == null) ws.GetRow(rowIndex).CreateCell(26);
+                    ws.GetRow(rowIndex).GetCell(26).SetCellValue(p.CreateDate != null ? p.CreateDate.Value.ToString("yyyy/MM/dd") : "");
 
                     if ((int)(90 * (rowIndex) / totalNum) > percent)
                     {
@@ -3034,6 +3040,8 @@ namespace FineUIPro.Web.Evaluation
                     wsCm.GetRow(rowIndex).GetCell(14).SetCellValue(p.User_Representative);
                     if (wsCm.GetRow(rowIndex).GetCell(15) == null) wsCm.GetRow(rowIndex).CreateCell(15);
                     wsCm.GetRow(rowIndex).GetCell(15).SetCellValue(p.BycDept);
+                    if (wsCm.GetRow(rowIndex).GetCell(16) == null) wsCm.GetRow(rowIndex).CreateCell(16);
+                    wsCm.GetRow(rowIndex).GetCell(16).SetCellValue(p.UploadDate != null ? p.UploadDate.Value.ToString("yyyy/MM/dd") : "");
 
                     if ((int)((90 * (rowIndex + punishCount)) / totalNum) > percent)
                     {

FCL/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectView>ShowAllFiles</ProjectView>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>
     </Use64BitIISExpress>

FCL/FineUIPro.Web/Web.config

@@ -55,7 +55,7 @@
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
       <add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" validate="false"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1">
+    <compilation debug="false" targetFramework="4.6.1">
       <buildProviders>
         <add extension=".rdlc" type="Microsoft.Reporting.RdlBuildProvider, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91"/>
       </buildProviders>

FCL/Model/Model.cs

@@ -9916,6 +9916,8 @@ namespace Model
 		
 		private string _BuyerReson;
 		
+		private string _SSRAdminId;
+		
 		private System.Nullable<System.DateTime> _SSRStaratDate;
 		
 		private System.Nullable<System.DateTime> _SSREndDate;
@@ -9928,8 +9930,6 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _UserDepEndDate;
 		
-		private string _SSRAdminId;
-		
 		private EntityRef<Base_Depart> _Base_Depart;
 		
 		private EntityRef<Sys_User> _Sys_User;
@@ -10042,6 +10042,8 @@ namespace Model
     partial void OnSESReasonChanged();
     partial void OnBuyerResonChanging(string value);
     partial void OnBuyerResonChanged();
+    partial void OnSSRAdminIdChanging(string value);
+    partial void OnSSRAdminIdChanged();
     partial void OnSSRStaratDateChanging(System.Nullable<System.DateTime> value);
     partial void OnSSRStaratDateChanged();
     partial void OnSSREndDateChanging(System.Nullable<System.DateTime> value);
@@ -10054,8 +10056,6 @@ namespace Model
     partial void OnUserDepStartDateChanged();
     partial void OnUserDepEndDateChanging(System.Nullable<System.DateTime> value);
     partial void OnUserDepEndDateChanged();
-    partial void OnSSRAdminIdChanging(string value);
-    partial void OnSSRAdminIdChanged();
     #endregion
 		
 		public EMC_Punishment()
@@ -11094,6 +11094,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SSRAdminId", DbType="NVarChar(50)")]
+		public string SSRAdminId
+		{
+			get
+			{
+				return this._SSRAdminId;
+			}
+			set
+			{
+				if ((this._SSRAdminId != value))
+				{
+					this.OnSSRAdminIdChanging(value);
+					this.SendPropertyChanging();
+					this._SSRAdminId = value;
+					this.SendPropertyChanged("SSRAdminId");
+					this.OnSSRAdminIdChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SSRStaratDate", DbType="DateTime")]
 		public System.Nullable<System.DateTime> SSRStaratDate
 		{
@@ -11214,26 +11234,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SSRAdminId", DbType="NVarChar(50)")]
-		public string SSRAdminId
-		{
-			get
-			{
-				return this._SSRAdminId;
-			}
-			set
-			{
-				if ((this._SSRAdminId != value))
-				{
-					this.OnSSRAdminIdChanging(value);
-					this.SendPropertyChanging();
-					this._SSRAdminId = value;
-					this.SendPropertyChanged("SSRAdminId");
-					this.OnSSRAdminIdChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_EMC_Punishment_Base_Depart", Storage="_Base_Depart", ThisKey="BYC_RU", OtherKey="DepartId", IsForeignKey=true)]
 		public Base_Depart Base_Depart
 		{
@@ -33778,6 +33778,8 @@ namespace Model
 		
 		private string _FileType;
 		
+		private System.Nullable<System.DateTime> _UploadDate;
+		
 		public View_FC_ContractManagement()
 		{
 		}
@@ -34037,6 +34039,22 @@ namespace Model
 				}
 			}
 		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UploadDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> UploadDate
+		{
+			get
+			{
+				return this._UploadDate;
+			}
+			set
+			{
+				if ((this._UploadDate != value))
+				{
+					this._UploadDate = value;
+				}
+			}
+		}
 	}
 	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_FC_ContractManagementLists")]

FCL/WebApi/WebApi.csproj.user

@@ -8,7 +8,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>