diff --git a/CreateModel.bat b/CreateModel.bat index 55640a5..115b938 100644 --- a/CreateModel.bat +++ b/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 diff --git a/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs b/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs index 3afe246..d75b85f 100644 --- a/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs +++ b/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) { diff --git a/FCL/FineUIPro.Web/File/Excel/Performance Report_CN.xlsx b/FCL/FineUIPro.Web/File/Excel/Performance Report_CN.xlsx index 6674422..633534f 100644 Binary files a/FCL/FineUIPro.Web/File/Excel/Performance Report_CN.xlsx and b/FCL/FineUIPro.Web/File/Excel/Performance Report_CN.xlsx differ diff --git a/FCL/FineUIPro.Web/File/Excel/Performance Report_EN.xlsx b/FCL/FineUIPro.Web/File/Excel/Performance Report_EN.xlsx index 2b05bd7..c883dc1 100644 Binary files a/FCL/FineUIPro.Web/File/Excel/Performance Report_EN.xlsx and b/FCL/FineUIPro.Web/File/Excel/Performance Report_EN.xlsx differ diff --git a/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user b/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user index fcf3204..accb770 100644 --- a/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ ShowAllFiles - Debug|Any CPU + Release|Any CPU true diff --git a/FCL/FineUIPro.Web/Web.config b/FCL/FineUIPro.Web/Web.config index 0d634cd..8701bac 100644 --- a/FCL/FineUIPro.Web/Web.config +++ b/FCL/FineUIPro.Web/Web.config @@ -55,7 +55,7 @@ - + diff --git a/FCL/Model/Model.cs b/FCL/Model/Model.cs index 29b3122..c3980f3 100644 --- a/FCL/Model/Model.cs +++ b/FCL/Model/Model.cs @@ -9916,6 +9916,8 @@ namespace Model private string _BuyerReson; + private string _SSRAdminId; + private System.Nullable _SSRStaratDate; private System.Nullable _SSREndDate; @@ -9928,8 +9930,6 @@ namespace Model private System.Nullable _UserDepEndDate; - private string _SSRAdminId; - private EntityRef _Base_Depart; private EntityRef _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 value); partial void OnSSRStaratDateChanged(); partial void OnSSREndDateChanging(System.Nullable value); @@ -10054,8 +10056,6 @@ namespace Model partial void OnUserDepStartDateChanged(); partial void OnUserDepEndDateChanging(System.Nullable 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 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 _UploadDate; + public View_FC_ContractManagement() { } @@ -34037,6 +34039,22 @@ namespace Model } } } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UploadDate", DbType="DateTime")] + public System.Nullable UploadDate + { + get + { + return this._UploadDate; + } + set + { + if ((this._UploadDate != value)) + { + this._UploadDate = value; + } + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_FC_ContractManagementLists")] diff --git a/FCL/WebApi/WebApi.csproj.user b/FCL/WebApi/WebApi.csproj.user index ca0d73e..643f3e5 100644 --- a/FCL/WebApi/WebApi.csproj.user +++ b/FCL/WebApi/WebApi.csproj.user @@ -8,7 +8,7 @@ - Debug|Any CPU + Release|Any CPU