lpf/xinjiang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1代码合并

Browse Source
This commit is contained in:
夏菊
2025-02-05 17:57:14 +08:00
parent 4bbce72980
commit 5712066e0a
57 changed files with 334 additions and 3709 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/Model/APIItem/HSSE/PersonItem.cs
-4
View File
@@ -395,9 +395,5 @@ namespace Model
get;
set;
}
/// <summary>
/// 部门ID
/// </summary>
public string DepartId { get; set; }
}
}
SGGL/Model/APIItem/HSSE/TestPlanItem.cs
-31
View File
@@ -179,24 +179,6 @@ namespace Model
get;
set;
}
/// <summary>
/// 考试部门ID
/// </summary>
public string DepartIds
{
get;
set;
}
/// <summary>
/// 考试部门名称
/// </summary>
public string DepartNames
{
get;
set;
}
/// <summary>
/// 考试二维码
/// </summary>
@@ -245,18 +227,5 @@ namespace Model
get;
set;
}
/// <summary>
/// 培训类型ID
/// </summary>
public string TrainTypeId
{
get;
set;
}
public string TrainTypeName
{
get;
set;
}
}
}
SGGL/Model/APIItem/HSSE/TestRecordItem.cs
+2 -14
View File
@@ -248,19 +248,7 @@ namespace Model
set;
}
/// <summary>
/// 签名
/// </summary>
public string Signature
{
get;
set;
}
public string Fingerprint
{
get;
set;
}
}
}
SGGL/Model/APIItem/HSSE/TrainingPlanItem.cs
-17
View File
@@ -210,22 +210,5 @@ namespace Model
get;
set;
}
/// <summary>
/// 培训部门ID
/// </summary>
public string DepartIds
{
get;
set;
}
/// <summary>
/// 培训部门
/// </summary>
public string DepartNames
{
get;
set;
}
}
}
SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs
-13
View File
@@ -48,14 +48,6 @@ namespace Model
set;
}
/// <summary>
/// 培训任务状态
/// </summary>
public string TaskStatesName
{
get;
set;
}
/// <summary>
/// 培训计划时间
/// </summary>
public string TrainStartDate
@@ -119,10 +111,5 @@ namespace Model
get;
set;
}
public string TrainingItemCode
{
get;
set;
}
}
}
SGGL/Model/APIItem/HSSE/TrainingTaskItemItem.cs
+2 -17
View File
@@ -109,21 +109,6 @@ namespace Model
get;
set;
}
/// <summary>
/// 学习时长(秒)
/// </summary>
public int? LearningTime
{
get;
set;
}
/// <summary>
/// 教材时长(秒)
/// </summary>
public int? AttachTime
{
get;
set;
}
}
}
}
SGGL/Model/Model.cs
+1 -325
View File
@@ -22,7 +22,7 @@ namespace Model
using System;
public partial class SGGLDB : System.Data.Linq.DataContext
public partial class SGGLDB : System.Data.Linq.DataContext
{
private static System.Data.Linq.Mapping.MappingSource mappingSource = new AttributeMappingSource();
@@ -394714,10 +394714,6 @@ namespace Model
private string _WorkPostIds;
private System.Nullable<int> _LearningTime;
private string _TestTrainingIds;
private EntitySet<Person_TrainingTask> _Person_TrainingTask;
private EntityRef<Training_CompanyTraining> _Training_CompanyTraining;
@@ -394742,10 +394738,6 @@ namespace Model
partial void OnCompileDateChanged();
partial void OnWorkPostIdsChanging(string value);
partial void OnWorkPostIdsChanged();
partial void OnLearningTimeChanging(System.Nullable<int> value);
partial void OnLearningTimeChanged();
partial void OnTestTrainingIdsChanging(string value);
partial void OnTestTrainingIdsChanged();
#endregion
public Training_CompanyTrainingItem()
@@ -394919,46 +394911,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LearningTime", DbType="Int")]
public System.Nullable<int> LearningTime
{
get
{
return this._LearningTime;
}
set
{
if ((this._LearningTime != value))
{
this.OnLearningTimeChanging(value);
this.SendPropertyChanging();
this._LearningTime = value;
this.SendPropertyChanged("LearningTime");
this.OnLearningTimeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestTrainingIds", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string TestTrainingIds
{
get
{
return this._TestTrainingIds;
}
set
{
if ((this._TestTrainingIds != value))
{
this.OnTestTrainingIdsChanging(value);
this.SendPropertyChanging();
this._TestTrainingIds = value;
this.SendPropertyChanged("TestTrainingIds");
this.OnTestTrainingIdsChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Person_TrainingTask_Training_CompanyTrainingItem", Storage="_Person_TrainingTask", ThisKey="CompanyTrainingItemId", OtherKey="CompanyTrainingItemId", DeleteRule="NO ACTION")]
public EntitySet<Person_TrainingTask> Person_TrainingTask
{
@@ -395727,10 +395679,6 @@ namespace Model
private string _Cycle;
private string _DepartIds;
private string _DepartNames;
private EntitySet<EduTrain_TrainRecord> _EduTrain_TrainRecord;
private EntityRef<Base_Project> _Base_Project;
@@ -395793,10 +395741,6 @@ namespace Model
partial void OnQRCodeUrlChanged();
partial void OnCycleChanging(string value);
partial void OnCycleChanged();
partial void OnDepartIdsChanging(string value);
partial void OnDepartIdsChanged();
partial void OnDepartNamesChanging(string value);
partial void OnDepartNamesChanged();
#endregion
public Training_Plan()
@@ -396229,46 +396173,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartIds", DbType="NVarChar(2000)")]
public string DepartIds
{
get
{
return this._DepartIds;
}
set
{
if ((this._DepartIds != value))
{
this.OnDepartIdsChanging(value);
this.SendPropertyChanging();
this._DepartIds = value;
this.SendPropertyChanged("DepartIds");
this.OnDepartIdsChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartNames", DbType="NVarChar(2000)")]
public string DepartNames
{
get
{
return this._DepartNames;
}
set
{
if ((this._DepartNames != value))
{
this.OnDepartNamesChanging(value);
this.SendPropertyChanging();
this._DepartNames = value;
this.SendPropertyChanged("DepartNames");
this.OnDepartNamesChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_EduTrain_TrainRecord_Training_Plan", Storage="_EduTrain_TrainRecord", ThisKey="PlanId", OtherKey="PlanId", DeleteRule="NO ACTION")]
public EntitySet<EduTrain_TrainRecord> EduTrain_TrainRecord
{
@@ -397258,8 +397162,6 @@ namespace Model
private System.Nullable<int> _VideoProgress;
private string _CompanyTrainingItemId;
private EntityRef<SitePerson_Person> _SitePerson_Person;
private EntityRef<Training_Plan> _Training_Plan;
@@ -397292,8 +397194,6 @@ namespace Model
partial void OnLearnTimeChanged();
partial void OnVideoProgressChanging(System.Nullable<int> value);
partial void OnVideoProgressChanged();
partial void OnCompanyTrainingItemIdChanging(string value);
partial void OnCompanyTrainingItemIdChanged();
#endregion
public Training_TaskItem()
@@ -397536,26 +397436,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompanyTrainingItemId", DbType="NVarChar(100)")]
public string CompanyTrainingItemId
{
get
{
return this._CompanyTrainingItemId;
}
set
{
if ((this._CompanyTrainingItemId != value))
{
this.OnCompanyTrainingItemIdChanging(value);
this.SendPropertyChanging();
this._CompanyTrainingItemId = value;
this.SendPropertyChanged("CompanyTrainingItemId");
this.OnCompanyTrainingItemIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_TaskItem_SitePerson_Person", Storage="_SitePerson_Person", ThisKey="PersonId", OtherKey="PersonId", IsForeignKey=true)]
public SitePerson_Person SitePerson_Person
{
@@ -397733,8 +397613,6 @@ namespace Model
private int _JValue;
private string _TrainTypeId;
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Sys_User> _Sys_User;
@@ -397797,8 +397675,6 @@ namespace Model
partial void OnMValueChanged();
partial void OnJValueChanging(int value);
partial void OnJValueChanged();
partial void OnTrainTypeIdChanging(string value);
partial void OnTrainTypeIdChanged();
#endregion
public Training_TestPlan()
@@ -398303,26 +398179,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainTypeId", DbType="NVarChar(50)")]
public string TrainTypeId
{
get
{
return this._TrainTypeId;
}
set
{
if ((this._TrainTypeId != value))
{
this.OnTrainTypeIdChanging(value);
this.SendPropertyChanging();
this._TrainTypeId = value;
this.SendPropertyChanged("TrainTypeId");
this.OnTrainTypeIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_TestPlan_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{
@@ -398788,12 +398644,6 @@ namespace Model
private int _Duration;
private string _Signature;
private string _Fingerprint;
private string _CompanyTrainingItemId;
private EntityRef<Base_Project> _Base_Project;
private EntityRef<SitePerson_Person> _SitePerson_Person;
@@ -398828,12 +398678,6 @@ namespace Model
partial void OnIsFiledChanged();
partial void OnDurationChanging(int value);
partial void OnDurationChanged();
partial void OnSignatureChanging(string value);
partial void OnSignatureChanged();
partial void OnFingerprintChanging(string value);
partial void OnFingerprintChanged();
partial void OnCompanyTrainingItemIdChanging(string value);
partial void OnCompanyTrainingItemIdChanged();
#endregion
public Training_TestRecord()
@@ -399077,66 +398921,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Signature", DbType="NVarChar(1000)")]
public string Signature
{
get
{
return this._Signature;
}
set
{
if ((this._Signature != value))
{
this.OnSignatureChanging(value);
this.SendPropertyChanging();
this._Signature = value;
this.SendPropertyChanged("Signature");
this.OnSignatureChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Fingerprint", DbType="NVarChar(1000)")]
public string Fingerprint
{
get
{
return this._Fingerprint;
}
set
{
if ((this._Fingerprint != value))
{
this.OnFingerprintChanging(value);
this.SendPropertyChanging();
this._Fingerprint = value;
this.SendPropertyChanged("Fingerprint");
this.OnFingerprintChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompanyTrainingItemId", DbType="NVarChar(50)")]
public string CompanyTrainingItemId
{
get
{
return this._CompanyTrainingItemId;
}
set
{
if ((this._CompanyTrainingItemId != value))
{
this.OnCompanyTrainingItemIdChanging(value);
this.SendPropertyChanging();
this._CompanyTrainingItemId = value;
this.SendPropertyChanged("CompanyTrainingItemId");
this.OnCompanyTrainingItemIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_TestRecord_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{
@@ -400185,10 +399969,6 @@ namespace Model
private string _EItemEng;
private string _DepartNames;
private string _DepartIds;
private EntityRef<Training_TestTraining> _Training_TestTraining;
private EntityRef<Training_TestTraining> _Training;
@@ -400241,10 +400021,6 @@ namespace Model
partial void OnDItemEngChanged();
partial void OnEItemEngChanging(string value);
partial void OnEItemEngChanged();
partial void OnDepartNamesChanging(string value);
partial void OnDepartNamesChanged();
partial void OnDepartIdsChanging(string value);
partial void OnDepartIdsChanged();
#endregion
public Training_TestTrainingItem()
@@ -400698,46 +400474,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartNames", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string DepartNames
{
get
{
return this._DepartNames;
}
set
{
if ((this._DepartNames != value))
{
this.OnDepartNamesChanging(value);
this.SendPropertyChanging();
this._DepartNames = value;
this.SendPropertyChanged("DepartNames");
this.OnDepartNamesChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartIds", DbType="NVarChar(4000)")]
public string DepartIds
{
get
{
return this._DepartIds;
}
set
{
if ((this._DepartIds != value))
{
this.OnDepartIdsChanging(value);
this.SendPropertyChanging();
this._DepartIds = value;
this.SendPropertyChanged("DepartIds");
this.OnDepartIdsChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_TestTrainingItem_Training_TestTraining", Storage="_Training_TestTraining", ThisKey="TrainingId", OtherKey="TrainingId", IsForeignKey=true)]
public Training_TestTraining Training_TestTraining
{
@@ -401151,8 +400887,6 @@ namespace Model
private string _UpState;
private System.Nullable<int> _LearningTime;
private EntitySet<Training_PlanItem> _Training_PlanItem;
private EntityRef<Sys_User> _Sys_User;
@@ -401195,8 +400929,6 @@ namespace Model
partial void OnUnitIdChanged();
partial void OnUpStateChanging(string value);
partial void OnUpStateChanged();
partial void OnLearningTimeChanging(System.Nullable<int> value);
partial void OnLearningTimeChanged();
#endregion
public Training_TrainingItem()
@@ -401535,26 +401267,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LearningTime", DbType="Int")]
public System.Nullable<int> LearningTime
{
get
{
return this._LearningTime;
}
set
{
if ((this._LearningTime != value))
{
this.OnLearningTimeChanging(value);
this.SendPropertyChanging();
this._LearningTime = value;
this.SendPropertyChanged("LearningTime");
this.OnLearningTimeChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_PlanItem_Training_TrainingItem", Storage="_Training_PlanItem", ThisKey="TrainingItemId", OtherKey="TrainingEduItemId", DeleteRule="NO ACTION")]
public EntitySet<Training_PlanItem> Training_PlanItem
{
@@ -456993,10 +456705,6 @@ namespace Model
private string _AnswerItems;
private string _DepartIds;
private string _DepartNames;
public View_Training_TestTrainingItem()
{
}
@@ -457384,38 +457092,6 @@ namespace Model
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartIds", DbType="NVarChar(4000)")]
public string DepartIds
{
get
{
return this._DepartIds;
}
set
{
if ((this._DepartIds != value))
{
this._DepartIds = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartNames", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string DepartNames
{
get
{
return this._DepartNames;
}
set
{
if ((this._DepartNames != value))
{
this._DepartNames = value;
}
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Training_TrainingItem")]
SGGL/Model/Model.csproj
-6
View File
@@ -73,14 +73,10 @@
<Compile Include="APIItem\CNCEC\UpCheckReportItem.cs" />
<Compile Include="APIItem\CNCEC\UpCheckReportItemItem.cs" />
<Compile Include="APIItem\CNCEC\UpCheckReportItemItem2.cs" />
<Compile Include="APIItem\CQMSItem.cs" />
<Compile Include="APIItem\DefectItem.cs" />
<Compile Include="APIItem\EnergyReport.cs" />
<Compile Include="APIItem\EnergyReportItem.cs" />
<Compile Include="APIItem\Environmental_OperationReportDto.cs" />
<Compile Include="APIItem\EPSummaryReport.cs" />
<Compile Include="APIItem\HiddenDangerItem.cs" />
<Compile Include="APIItem\HJGLItem.cs" />
<Compile Include="APIItem\HJGL\BSSteelItem.cs" />
<Compile Include="APIItem\HJGL\ConsumablesItem.cs" />
<Compile Include="APIItem\HJGL\ElectrodeRecoveryItem.cs" />
@@ -90,7 +86,6 @@
<Compile Include="APIItem\HJGL\WelderItem.cs" />
<Compile Include="APIItem\HJGL\WelderPerformanceItem.cs" />
<Compile Include="APIItem\HJGL\WeldingMethodItem.cs" />
<Compile Include="APIItem\HSSEItem.cs" />
<Compile Include="APIItem\HSSE\ChartAnalysisItem.cs" />
<Compile Include="APIItem\HSSE\CheckSpecialDetailItem.cs" />
<Compile Include="APIItem\HSSE\CheckSpecialItem.cs" />
@@ -177,7 +172,6 @@
<Compile Include="APIItem\SHHSE\NewSYHSEDataItem.cs" />
<Compile Include="APIItem\SHHSE\NewSYHSEDataRealTimeDeviceItem.cs" />
<Compile Include="APIItem\SHHSE\NewSYHSEDataRiskControlItem.cs" />
<Compile Include="APIItem\SYHSEItem.cs" />
<Compile Include="APIItem\SYHSE\DataEnvironmentProtectionItem.cs" />
<Compile Include="APIItem\SYHSE\DataProjectItem.cs" />
<Compile Include="APIItem\SYHSE\DataRiskItem.cs" />