20230724与博晟接口新增是否删除标识、列表显示已删除标识不显示

DataBase/版本日志/SGGLDB_WH_2023-07-24.sql

@@ -0,0 +1,15 @@
+-- ÐÂÔö²©êÉɾ³ý±êʶ
+ALTER TABLE Bo_Sheng_Exam ADD DeleteTag NVARCHAR(50) NULL
+GO
+--ALTER TABLE Bo_Sheng_Person ADD DeleteTag NVARCHAR(50) NULL
+--GO
+ALTER TABLE Bo_Sheng_PersonTrainRecord ADD DeleteTag NVARCHAR(50) NULL
+GO
+--ALTER TABLE Bo_Sheng_Train ADD DeleteTag NVARCHAR(50) NULL
+--GO
+--ALTER TABLE Bo_Sheng_TrainPerson ADD DeleteTag NVARCHAR(50) NULL
+--GO
+ALTER TABLE Bo_Sheng_Unit ADD DeleteTag NVARCHAR(50) NULL
+GO
+update Sys_DataExchange set IsUpdate =0 where IsUpdate=1 and  MessageText like '%DeleteTag%'
+go

SGGL/BLL/BoSheng/BOSHENGMonitorService.cs

@@ -220,13 +220,15 @@ namespace BLL
                     {
                         string getID = item["ID"].ToString();
                         var getPerson = db.Bo_Sheng_Person.FirstOrDefault(x => x.ID == getID);
-                        if (!string.IsNullOrEmpty(getID) && getPerson == null)
+                        if (!string.IsNullOrEmpty(getID) )
+                        {
+                            if (getPerson == null)
                             {
                                 Model.Bo_Sheng_Person newPerson = new Model.Bo_Sheng_Person
                                 {
                                     ID = getID,
-                                ProjectId =projectId,
+                                    ProjectId = projectId,
-                                CreateDate =Funs.GetNewDateTime( item["CreateDate"].ToString()),
+                                    CreateDate = Funs.GetNewDateTime(item["CreateDate"].ToString()),
                                     CreateUser = item["CreateUser"].ToString(),
                                     OperDate = Funs.GetNewDateTime(item["OperDate"].ToString()),
                                     OperUser = item["OperUser"].ToString(),
@@ -281,6 +283,14 @@ namespace BLL
                                 };
                                 insertPersons.Add(newPerson);
                             }
+                            else
+                            {
+                                getPerson.DeleteUser = item["DeleteUser"].ToString();
+                                getPerson.DeleteDate = Funs.GetNewDateTime(item["DeleteDate"].ToString());
+                                getPerson.DeleteTag = item["DeleteTag"].ToString();
+                                db.SubmitChanges();
+                            }
+                        }
                     }
 
                     if (insertPersons.Count() > 0)
@@ -319,12 +329,15 @@ namespace BLL
                     {
                         string getID = item["ID"].ToString();
                         var getUnit = db.Bo_Sheng_Unit.FirstOrDefault(x => x.ID == getID);
-                        if (!string.IsNullOrEmpty(getID) && getUnit == null)
+                        if (!string.IsNullOrEmpty(getID))
+                        {
+                            if (getUnit == null)
                             {
                                 Model.Bo_Sheng_Unit newUnit = new Model.Bo_Sheng_Unit
                                 {
                                     ID = getID,
                                     ProjectId = projectId,
+                                    DeleteTag = item["DeleteTag"].ToString(),
                                     ParentID = item["ParentID"].ToString(),
                                     DepartCode = item["DepartCode"].ToString(),
                                     ParentCode = item["ParentCode"].ToString(),
@@ -346,6 +359,12 @@ namespace BLL
                                 };
                                 insertUnits.Add(newUnit);
                             }
+                            else
+                            {
+                                getUnit.DeleteTag = item["DeleteTag"].ToString();
+                                db.SubmitChanges();
+                            }
+                        }
                     }
                     if (insertUnits.Count() > 0)
                     {
@@ -381,14 +400,16 @@ namespace BLL
                     {
                         string getID = item["ID"].ToString();
                         var getTrain = db.Bo_Sheng_Train.FirstOrDefault(x => x.ID == getID);
-                        if (!string.IsNullOrEmpty(getID) && getTrain == null)
+                        if (!string.IsNullOrEmpty(getID))
+                        {
+                            if (getTrain == null)
                             {
                                 Model.Bo_Sheng_Train newTrainRecord = new Model.Bo_Sheng_Train
                                 {
                                     ID = getID,
-                                ProjectId =projectId,
+                                    ProjectId = projectId,
                                     DeleteUser = item["DeleteUser"].ToString(),
-                                DeleteDate =Funs.GetNewDateTime( item["DeleteDate"].ToString()),
+                                    DeleteDate = Funs.GetNewDateTime(item["DeleteDate"].ToString()),
                                     DeleteTag = item["DeleteTag"].ToString(),
                                     RecordName = item["RecordName"].ToString(),
                                     TrainType = item["TrainType"].ToString(),
@@ -420,6 +441,14 @@ namespace BLL
                                 };
                                 insertTrains.Add(newTrainRecord);
                             }
+                            else
+                            {
+                                getTrain.DeleteUser = item["DeleteUser"].ToString();
+                                getTrain.DeleteDate = Funs.GetNewDateTime(item["DeleteDate"].ToString());
+                                getTrain.DeleteTag = item["DeleteTag"].ToString();
+                                db.SubmitChanges();
+                            }
+                        }
                     }
                     if (insertTrains.Count() > 0)
                     {
@@ -455,14 +484,16 @@ namespace BLL
                     {
                         string getID = item["ID"].ToString();
                         var getTrainPerson = db.Bo_Sheng_TrainPerson.FirstOrDefault(x => x.ID == getID);
-                        if (!string.IsNullOrEmpty(getID) && getTrainPerson == null)
+                        if (!string.IsNullOrEmpty(getID))
+                        {
+                            if (getTrainPerson == null)
                             {
                                 Model.Bo_Sheng_TrainPerson newPerson = new Model.Bo_Sheng_TrainPerson
                                 {
                                     ID = getID,
                                     ProjectId = projectId,
                                     DeleteUser = item["DeleteUser"].ToString(),
-                                DeleteDate =Funs.GetNewDateTime( item["DeleteDate"].ToString()),
+                                    DeleteDate = Funs.GetNewDateTime(item["DeleteDate"].ToString()),
                                     DeleteTag = item["DeleteTag"].ToString(),
                                     EmpName = item["EmpName"].ToString(),
                                     IdentifyId = item["IdentifyId"].ToString(),
@@ -478,9 +509,9 @@ namespace BLL
                                     SignInType = item["SignInType"].ToString(),
                                     TrainPeriod = item["TrainPeriod"].ToString(),
                                     State = item["State"].ToString(),
-                                TotalScore =Funs.GetNewDecimal( item["TotalScore"].ToString()),
+                                    TotalScore = Funs.GetNewDecimal(item["TotalScore"].ToString()),
-                                PassScore =Funs.GetNewDecimal( item["PassScore"].ToString()),
+                                    PassScore = Funs.GetNewDecimal(item["PassScore"].ToString()),
-                                Score = Funs.GetNewDecimal( item["Score"].ToString()),
+                                    Score = Funs.GetNewDecimal(item["Score"].ToString()),
                                     IsPass = item["IsPass"].ToString(),
                                     GroupNo = item["GroupNo"].ToString(),
                                     ExamNo = item["ExamNo"].ToString(),
@@ -496,6 +527,14 @@ namespace BLL
                                 };
                                 insertTrainPersons.Add(newPerson);
                             }
+                            else
+                            {
+                                getTrainPerson.DeleteUser = item["DeleteUser"].ToString();
+                                getTrainPerson.DeleteDate = Funs.GetNewDateTime(item["DeleteDate"].ToString());
+                                getTrainPerson.DeleteTag = item["DeleteTag"].ToString();
+                                db.SubmitChanges();
+                            }
+                        }
                     }
 
                     if (insertTrainPersons.Count() > 0)
@@ -532,17 +571,20 @@ namespace BLL
                     {
                         string getID = item["ID"].ToString();
                         var getExam = db.Bo_Sheng_Exam.FirstOrDefault(x => x.ID == getID);
-                        if (!string.IsNullOrEmpty(getID) && getExam == null)
+                        if (!string.IsNullOrEmpty(getID))
+                        {
+                            if (getExam == null)
                             {
                                 Model.Bo_Sheng_Exam newTrainTest = new Model.Bo_Sheng_Exam
                                 {
                                     ID = getID,
                                     ProjectId = projectId,
+                                    DeleteTag = item["DeleteTag"].ToString(),
                                     RecordId = item["RecordId"].ToString(),
                                     ExamNo = item["ExamNo"].ToString(),
                                     GroupNo = item["GroupNo"].ToString(),
                                     CourseID = item["CourseID"].ToString(),
-                                COrder =Funs.GetNewInt(item["COrder"].ToString()),
+                                    COrder = Funs.GetNewInt(item["COrder"].ToString()),
                                     QsnCode = item["QsnCode"].ToString(),
                                     QsnId = item["QsnId"].ToString(),
                                     QsnContent = item["QsnContent"].ToString(),
@@ -558,6 +600,12 @@ namespace BLL
 
                                 insertExams.Add(newTrainTest);
                             }
+                            else
+                            {
+                                getExam.DeleteTag = item["DeleteTag"].ToString();
+                                db.SubmitChanges();
+                            }
+                        }
                     }
 
                     if (insertExams.Count() > 0)
@@ -594,12 +642,15 @@ namespace BLL
                     {
                         string getID = item["ID"].ToString();
                         var getPersonTrainRecord = db.Bo_Sheng_PersonTrainRecord.FirstOrDefault(x => x.ID == getID);
-                        if (!string.IsNullOrEmpty(getID) && getPersonTrainRecord == null)
+                        if (!string.IsNullOrEmpty(getID))
+                        {
+                            if (getPersonTrainRecord == null)
                             {
                                 Model.Bo_Sheng_PersonTrainRecord newRecord = new Model.Bo_Sheng_PersonTrainRecord
                                 {
                                     ID = getID,
                                     ProjectId = projectId,
+                                    DeleteTag = item["DeleteTag"].ToString(),
                                     EmpName = item["EmpName"].ToString(),
                                     IdentifyId = item["IdentifyId"].ToString(),
                                     CategoryName = item["CategoryName"].ToString(),
@@ -630,6 +681,12 @@ namespace BLL
 
                                 insertPersonTrainRecords.Add(newRecord);
                             }
+                            else
+                            {
+                                getPersonTrainRecord.DeleteTag = item["DeleteTag"].ToString();
+                                db.SubmitChanges();
+                            }
+                        }
                     }
 
                     if (insertPersonTrainRecords.Count() > 0)

SGGL/BLL/BoSheng/BOSHENGService.cs

@@ -22,7 +22,9 @@ namespace BLL
         /// <summary>
         /// 定义变量
         /// </summary>
-        private static IQueryable<Model.Bo_Sheng_Unit> getUnits = from x in db.Bo_Sheng_Unit select x;
+        private static IQueryable<Model.Bo_Sheng_Unit> getUnits = from x in db.Bo_Sheng_Unit  
+                                                                  where (x.DeleteTag == "True" || x.DeleteTag == null) 
+                                                                  select x;
 
         /// <summary>
         /// 获取分页列表
@@ -88,7 +90,9 @@ namespace BLL
         /// <summary>
         /// 定义变量
         /// </summary>
-        private static IQueryable<Model.Bo_Sheng_Person> getPersons = from x in db.Bo_Sheng_Person select x;
+        private static IQueryable<Model.Bo_Sheng_Person> getPersons = from x in db.Bo_Sheng_Person
+                                                                      where (x.DeleteTag == "True" || x.DeleteTag == null)
+                                                                      select x;
 
         /// <summary>
         /// 获取分页列表
@@ -195,7 +199,9 @@ namespace BLL
         /// <summary>
         /// 定义变量
         /// </summary>
-        private static IQueryable<Model.Bo_Sheng_Train> getTrains = from x in db.Bo_Sheng_Train select x;
+        private static IQueryable<Model.Bo_Sheng_Train> getTrains = from x in db.Bo_Sheng_Train
+                                                                    where (x.DeleteTag == "True" || x.DeleteTag == null)
+                                                                    select x;
 
         /// <summary>
         /// 获取分页列表
@@ -275,7 +281,9 @@ namespace BLL
         /// <summary>
         /// 定义变量
         /// </summary>
-        private static IQueryable<Model.Bo_Sheng_TrainPerson> getTrainPersons = from x in db.Bo_Sheng_TrainPerson select x;
+        private static IQueryable<Model.Bo_Sheng_TrainPerson> getTrainPersons = from x in db.Bo_Sheng_TrainPerson
+                                                                                where (x.DeleteTag == "True" || x.DeleteTag == null)
+                                                                                select x;
 
         /// <summary>
         /// 获取分页列表
@@ -361,7 +369,9 @@ namespace BLL
         /// <summary>
         /// 定义变量
         /// </summary>
-        private static IQueryable<Model.Bo_Sheng_Exam> getExams = from x in db.Bo_Sheng_Exam select x;
+        private static IQueryable<Model.Bo_Sheng_Exam> getExams = from x in db.Bo_Sheng_Exam 
+                                                                  where (x.DeleteTag == "True" || x.DeleteTag == null) 
+                                                                  select x;
 
         /// <summary>
         /// 获取分页列表
@@ -429,7 +439,9 @@ namespace BLL
         /// <summary>
         /// 定义变量
         /// </summary>
-        private static IQueryable<Model.Bo_Sheng_PersonTrainRecord> getPersonTrainRecords = from x in db.Bo_Sheng_PersonTrainRecord select x;
+        private static IQueryable<Model.Bo_Sheng_PersonTrainRecord> getPersonTrainRecords = from x in db.Bo_Sheng_PersonTrainRecord 
+                                                                                            where (x.DeleteTag == "True" || x.DeleteTag == null) 
+                                                                                            select x;
 
         /// <summary>
         /// 获取分页列表

SGGL/FineUIPro.Web/ErrLog.txt

@@ -1,19 +0,0 @@
-
-错误信息开始=====>
-错误类型:FileNotFoundException
-错误信息:未能找到文件“E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\File\Excel\DataIn\施工进度报表模板.xls”。
-错误堆栈:
-   在 FineUIPro.Web.JDGL.CostAnalysis.JDReport.btnOutExcel_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\JDGL\CostAnalysis\JDReport.aspx.cs:行号 3480
-   在 FineUIPro.Button.OnClick(EventArgs e)
-   在 (Button , EventArgs )
-   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:07/03/2023 10:27:29
-出错文件:http://localhost:9733/JDGL/CostAnalysis/JDReport.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:07/03/2023 10:27:29
-

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -66,9 +66,9 @@
     <Reference Include="Apache.NMS.Fakes">
       <HintPath>FakesAssemblies\Apache.NMS.Fakes.dll</HintPath>
     </Reference>
-    <Reference Include="Aspose.Words, Version=21.8.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
+    <Reference Include="Aspose.Words, Version=10.5.0.0, Culture=neutral, PublicKeyToken=fa9a48344f15a022, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\Aspose.Words.dll</HintPath>
+      <HintPath>..\FineUIPro\Reference BLL\Aspose.Words.dll</HintPath>
     </Reference>
     <Reference Include="AxInterop.SYNCARDOCXLib">
       <HintPath>..\FineUIPro\Reference BLL\AxInterop.SYNCARDOCXLib.dll</HintPath>
@@ -93,7 +93,7 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
       <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.dll</HintPath>
@@ -16736,7 +16736,7 @@
           <DevelopmentServerPort>0</DevelopmentServerPort>
           <DevelopmentServerVPath>
           </DevelopmentServerVPath>
-          <IISUrl>http://localhost:9733/</IISUrl>
+          <IISUrl>http://localhost:8579/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

SGGL/Model/Model.cs

@@ -44007,6 +44007,8 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _UploadTime;
 		
+		private string _DeleteTag;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -44047,6 +44049,8 @@ namespace Model
     partial void OnAnalysisChanged();
     partial void OnUploadTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnUploadTimeChanged();
+    partial void OnDeleteTagChanging(string value);
+    partial void OnDeleteTagChanged();
     #endregion
 		
 		public Bo_Sheng_Exam()
@@ -44414,6 +44418,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DeleteTag", DbType="NVarChar(50)")]
+		public string DeleteTag
+		{
+			get
+			{
+				return this._DeleteTag;
+			}
+			set
+			{
+				if ((this._DeleteTag != value))
+				{
+					this.OnDeleteTagChanging(value);
+					this.SendPropertyChanging();
+					this._DeleteTag = value;
+					this.SendPropertyChanged("DeleteTag");
+					this.OnDeleteTagChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -45831,6 +45855,8 @@ namespace Model
 		
 		private string _TrainDescript;
 		
+		private string _DeleteTag;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -45891,6 +45917,8 @@ namespace Model
     partial void OnTrainContentChanged();
     partial void OnTrainDescriptChanging(string value);
     partial void OnTrainDescriptChanged();
+    partial void OnDeleteTagChanging(string value);
+    partial void OnDeleteTagChanged();
     #endregion
 		
 		public Bo_Sheng_PersonTrainRecord()
@@ -46458,6 +46486,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DeleteTag", DbType="NVarChar(50)")]
+		public string DeleteTag
+		{
+			get
+			{
+				return this._DeleteTag;
+			}
+			set
+			{
+				if ((this._DeleteTag != value))
+				{
+					this.OnDeleteTagChanging(value);
+					this.SendPropertyChanging();
+					this._DeleteTag = value;
+					this.SendPropertyChanged("DeleteTag");
+					this.OnDeleteTagChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -48185,6 +48233,8 @@ namespace Model
 		
 		private string _OperUser;
 		
+		private string _DeleteTag;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -48229,6 +48279,8 @@ namespace Model
     partial void OnOperDateChanged();
     partial void OnOperUserChanging(string value);
     partial void OnOperUserChanged();
+    partial void OnDeleteTagChanging(string value);
+    partial void OnDeleteTagChanged();
     #endregion
 		
 		public Bo_Sheng_Unit()
@@ -48636,6 +48688,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DeleteTag", DbType="NVarChar(50)")]
+		public string DeleteTag
+		{
+			get
+			{
+				return this._DeleteTag;
+			}
+			set
+			{
+				if ((this._DeleteTag != value))
+				{
+					this.OnDeleteTagChanging(value);
+					this.SendPropertyChanging();
+					this._DeleteTag = value;
+					this.SendPropertyChanged("DeleteTag");
+					this.OnDeleteTagChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -89579,12 +89651,12 @@ namespace Model
 		
 		private string _EquipmentOrMatail;
 		
+		private string _Unit;
+		
 		private string _Status;
 		
 		private string _AuditMan;
 		
-		private string _Unit;
-		
 		private EntityRef<Base_CNProfessional> _Base_CNProfessional;
 		
 		private EntityRef<Base_Project> _Base_Project;
@@ -89635,12 +89707,12 @@ namespace Model
     partial void OnAttributeChanged();
     partial void OnEquipmentOrMatailChanging(string value);
     partial void OnEquipmentOrMatailChanged();
+    partial void OnUnitChanging(string value);
+    partial void OnUnitChanged();
     partial void OnStatusChanging(string value);
     partial void OnStatusChanged();
     partial void OnAuditManChanging(string value);
     partial void OnAuditManChanged();
-    partial void OnUnitChanging(string value);
-    partial void OnUnitChanged();
     #endregion
 		
 		public Comprehensive_InspectionEquipment()
@@ -90063,6 +90135,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Unit", DbType="NVarChar(50)")]
+		public string Unit
+		{
+			get
+			{
+				return this._Unit;
+			}
+			set
+			{
+				if ((this._Unit != value))
+				{
+					this.OnUnitChanging(value);
+					this.SendPropertyChanging();
+					this._Unit = value;
+					this.SendPropertyChanged("Unit");
+					this.OnUnitChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="NVarChar(2)")]
 		public string Status
 		{
@@ -90103,26 +90195,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Unit", DbType="NVarChar(50)")]
-		public string Unit
-		{
-			get
-			{
-				return this._Unit;
-			}
-			set
-			{
-				if ((this._Unit != value))
-				{
-					this.OnUnitChanging(value);
-					this.SendPropertyChanging();
-					this._Unit = value;
-					this.SendPropertyChanged("Unit");
-					this.OnUnitChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_InspectionEquipment_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)]
 		public Base_CNProfessional Base_CNProfessional
 		{