diff --git a/DataBase/版本日志/SGGLDB_WH_2023-07-24.sql b/DataBase/版本日志/SGGLDB_WH_2023-07-24.sql
new file mode 100644
index 00000000..9e7ae46b
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/SGGL/BLL/BoSheng/BOSHENGMonitorService.cs b/SGGL/BLL/BoSheng/BOSHENGMonitorService.cs
index f5a1aa7b..bc18dd98 100644
--- a/SGGL/BLL/BoSheng/BOSHENGMonitorService.cs
+++ b/SGGL/BLL/BoSheng/BOSHENGMonitorService.cs
@@ -220,66 +220,76 @@ 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) )
{
- Model.Bo_Sheng_Person newPerson = new Model.Bo_Sheng_Person
+ if (getPerson == null)
{
- ID = getID,
- ProjectId =projectId,
- CreateDate =Funs.GetNewDateTime( item["CreateDate"].ToString()),
- CreateUser = item["CreateUser"].ToString(),
- OperDate = Funs.GetNewDateTime(item["OperDate"].ToString()),
- OperUser = item["OperUser"].ToString(),
- DeleteUser = item["DeleteUser"].ToString(),
- DeleteDate = Funs.GetNewDateTime(item["DeleteDate"].ToString()),
- DeleteTag = item["DeleteTag"].ToString(),
- Name = item["Name"].ToString(),
- Sex = item["Sex"].ToString(),
- BirthDay = Funs.GetNewDateTime(item["BirthDay"].ToString()),
- Address = item["Address"].ToString(),
- Nation = item["Nation"].ToString(),
- IdentifyID = item["IdentifyID"].ToString(),
- Kind = item["Kind"].ToString(),
- Photo = item["Photo"].ToString(),
- Police = item["Police"].ToString(),
- ValidPeriodStart = item["ValidPeriodStart"].ToString(),
- ValidPeriodEnd = item["ValidPeriodEnd"].ToString(),
- Education = item["Education"].ToString(),
- Native = item["Native"].ToString(),
- Telephone = item["Telephone"].ToString(),
- MaritalStatus = item["MaritalStatus"].ToString(),
- BloodGroup = item["BloodGroup"].ToString(),
- RegisteredType = item["RegisteredType"].ToString(),
- Age = Funs.GetNewInt(item["Age"].ToString()),
- JobNumber = item["JobNumber"].ToString(),
- CardContent = item["CardContent"].ToString(),
- ContactTel = item["ContactTel"].ToString(),
- SecondContacts = item["SecondContacts"].ToString(),
- SecondContactsTel = item["SecondContactsTel"].ToString(),
- NewAddress = item["NewAddress"].ToString(),
- HealthCondition = item["HealthCondition"].ToString(),
- HealthFile = item["HealthFile"].ToString(),
- BuildArea = item["BuildArea"].ToString(),
- TraPrincipal = item["TraPrincipal"].ToString(),
- RegisterDate = Funs.GetNewDateTime(item["RegisterDate"].ToString()),
- CategoryType = item["CategoryType"].ToString(),
- Station = item["Station"].ToString(),
- Category = item["Category"].ToString(),
- CategoryLevel = item["CategoryLevel"].ToString(),
- EntranceDate = Funs.GetNewDateTime(item["EntranceDate"].ToString()),
- IsOut = item["IsOut"].ToString(),
- LeaveDate = Funs.GetNewDateTime(item["LeaveDate"].ToString()),
- IsBlackList = item["IsBlackList"].ToString(),
- AgreementId = item["AgreementId"].ToString(),
- HasInsurance = item["HasInsurance"].ToString(),
- DeviceNumber = item["DeviceNumber"].ToString(),
- IsActive = item["IsActive"].ToString(),
- DepartId = item["DepartId"].ToString(),
- DepartName = item["DepartName"].ToString(),
- OwnerDepartId = item["OwnerDepartId"].ToString(),
- UploadTime = Funs.GetNewDateTime(item["UploadTime"].ToString()),
- };
- insertPersons.Add(newPerson);
+ Model.Bo_Sheng_Person newPerson = new Model.Bo_Sheng_Person
+ {
+ ID = getID,
+ ProjectId = projectId,
+ CreateDate = Funs.GetNewDateTime(item["CreateDate"].ToString()),
+ CreateUser = item["CreateUser"].ToString(),
+ OperDate = Funs.GetNewDateTime(item["OperDate"].ToString()),
+ OperUser = item["OperUser"].ToString(),
+ DeleteUser = item["DeleteUser"].ToString(),
+ DeleteDate = Funs.GetNewDateTime(item["DeleteDate"].ToString()),
+ DeleteTag = item["DeleteTag"].ToString(),
+ Name = item["Name"].ToString(),
+ Sex = item["Sex"].ToString(),
+ BirthDay = Funs.GetNewDateTime(item["BirthDay"].ToString()),
+ Address = item["Address"].ToString(),
+ Nation = item["Nation"].ToString(),
+ IdentifyID = item["IdentifyID"].ToString(),
+ Kind = item["Kind"].ToString(),
+ Photo = item["Photo"].ToString(),
+ Police = item["Police"].ToString(),
+ ValidPeriodStart = item["ValidPeriodStart"].ToString(),
+ ValidPeriodEnd = item["ValidPeriodEnd"].ToString(),
+ Education = item["Education"].ToString(),
+ Native = item["Native"].ToString(),
+ Telephone = item["Telephone"].ToString(),
+ MaritalStatus = item["MaritalStatus"].ToString(),
+ BloodGroup = item["BloodGroup"].ToString(),
+ RegisteredType = item["RegisteredType"].ToString(),
+ Age = Funs.GetNewInt(item["Age"].ToString()),
+ JobNumber = item["JobNumber"].ToString(),
+ CardContent = item["CardContent"].ToString(),
+ ContactTel = item["ContactTel"].ToString(),
+ SecondContacts = item["SecondContacts"].ToString(),
+ SecondContactsTel = item["SecondContactsTel"].ToString(),
+ NewAddress = item["NewAddress"].ToString(),
+ HealthCondition = item["HealthCondition"].ToString(),
+ HealthFile = item["HealthFile"].ToString(),
+ BuildArea = item["BuildArea"].ToString(),
+ TraPrincipal = item["TraPrincipal"].ToString(),
+ RegisterDate = Funs.GetNewDateTime(item["RegisterDate"].ToString()),
+ CategoryType = item["CategoryType"].ToString(),
+ Station = item["Station"].ToString(),
+ Category = item["Category"].ToString(),
+ CategoryLevel = item["CategoryLevel"].ToString(),
+ EntranceDate = Funs.GetNewDateTime(item["EntranceDate"].ToString()),
+ IsOut = item["IsOut"].ToString(),
+ LeaveDate = Funs.GetNewDateTime(item["LeaveDate"].ToString()),
+ IsBlackList = item["IsBlackList"].ToString(),
+ AgreementId = item["AgreementId"].ToString(),
+ HasInsurance = item["HasInsurance"].ToString(),
+ DeviceNumber = item["DeviceNumber"].ToString(),
+ IsActive = item["IsActive"].ToString(),
+ DepartId = item["DepartId"].ToString(),
+ DepartName = item["DepartName"].ToString(),
+ OwnerDepartId = item["OwnerDepartId"].ToString(),
+ UploadTime = Funs.GetNewDateTime(item["UploadTime"].ToString()),
+ };
+ insertPersons.Add(newPerson);
+ }
+ else
+ {
+ getPerson.DeleteUser = item["DeleteUser"].ToString();
+ getPerson.DeleteDate = Funs.GetNewDateTime(item["DeleteDate"].ToString());
+ getPerson.DeleteTag = item["DeleteTag"].ToString();
+ db.SubmitChanges();
+ }
}
}
@@ -319,32 +329,41 @@ 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))
{
- Model.Bo_Sheng_Unit newUnit = new Model.Bo_Sheng_Unit
+ if (getUnit == null)
{
- ID = getID,
- ProjectId = projectId,
- ParentID = item["ParentID"].ToString(),
- DepartCode = item["DepartCode"].ToString(),
- ParentCode = item["ParentCode"].ToString(),
- DepartName = item["DepartName"].ToString(),
- DepartType = item["DepartType"].ToString(),
- DepartShortName = item["DepartShortName"].ToString(),
- DepartOrder = item["DepartOrder"].ToString(),
- State = item["State"].ToString(),
- DepartSir = item["DepartSir"].ToString(),
- IsEpiboly = item["IsEpiboly"].ToString(),
- Phone = item["Phone"].ToString(),
- Charge = item["Charge"].ToString(),
- Remark = item["Remark"].ToString(),
- OwnerDeptID = item["OwnerDeptID"].ToString(),
- CreateDate = Funs.GetNewDateTime(item["CreateDate"].ToString()),
- CreateUser = item["CreateUser"].ToString(),
- OperDate = Funs.GetNewDateTime(item["OperDate"].ToString()),
- OperUser = item["OperUser"].ToString(),
- };
- insertUnits.Add(newUnit);
+ 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(),
+ DepartName = item["DepartName"].ToString(),
+ DepartType = item["DepartType"].ToString(),
+ DepartShortName = item["DepartShortName"].ToString(),
+ DepartOrder = item["DepartOrder"].ToString(),
+ State = item["State"].ToString(),
+ DepartSir = item["DepartSir"].ToString(),
+ IsEpiboly = item["IsEpiboly"].ToString(),
+ Phone = item["Phone"].ToString(),
+ Charge = item["Charge"].ToString(),
+ Remark = item["Remark"].ToString(),
+ OwnerDeptID = item["OwnerDeptID"].ToString(),
+ CreateDate = Funs.GetNewDateTime(item["CreateDate"].ToString()),
+ CreateUser = item["CreateUser"].ToString(),
+ OperDate = Funs.GetNewDateTime(item["OperDate"].ToString()),
+ OperUser = item["OperUser"].ToString(),
+ };
+ insertUnits.Add(newUnit);
+ }
+ else
+ {
+ getUnit.DeleteTag = item["DeleteTag"].ToString();
+ db.SubmitChanges();
+ }
}
}
if (insertUnits.Count() > 0)
@@ -381,44 +400,54 @@ 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))
{
- Model.Bo_Sheng_Train newTrainRecord = new Model.Bo_Sheng_Train
+ if (getTrain == null)
{
- ID = getID,
- ProjectId =projectId,
- DeleteUser = item["DeleteUser"].ToString(),
- DeleteDate =Funs.GetNewDateTime( item["DeleteDate"].ToString()),
- DeleteTag = item["DeleteTag"].ToString(),
- RecordName = item["RecordName"].ToString(),
- TrainType = item["TrainType"].ToString(),
- PaperMode = item["PaperMode"].ToString(),
- TrainMode = item["TrainMode"].ToString(),
- TrainPrincipal = item["TrainPrincipal"].ToString(),
- TrainStartDate = Funs.GetNewDateTime(item["TrainStartDate"].ToString()),
- TrainEndDate = Funs.GetNewDateTime(item["TrainEndDate"].ToString()),
- TrainContent = item["TrainContent"].ToString(),
- TrainDescript = item["TrainDescript"].ToString(),
- TrainPeriod = item["TrainPeriod"].ToString(),
- PersonCount = Funs.GetNewInt(item["PersonCount"].ToString()),
- PassedCount = Funs.GetNewInt(item["PassedCount"].ToString()),
- CoverImg = item["CoverImg"].ToString(),
- DemandID = item["DemandID"].ToString(),
- CourseCount = Funs.GetNewInt(item["CourseCount"].ToString()),
- CourseDuration = item["CourseDuration"].ToString(),
- Source = item["Source"].ToString(),
- Description = item["Description"].ToString(),
- DeviceNo = item["DeviceNo"].ToString(),
- OwnerDepartId = item["OwnerDepartId"].ToString(),
- UploadTime = Funs.GetNewDateTime(item["UploadTime"].ToString()),
- OwnerDeptName = item["OwnerDeptName"].ToString(),
- TrainDepart = item["TrainDepart"].ToString(),
- CreateDate = Funs.GetNewDateTime(item["CreateDate"].ToString()),
- CreateUser = item["CreateUser"].ToString(),
- OperDate = Funs.GetNewDateTime(item["OperDate"].ToString()),
- OperUser = item["OperUser"].ToString(),
- };
- insertTrains.Add(newTrainRecord);
+ Model.Bo_Sheng_Train newTrainRecord = new Model.Bo_Sheng_Train
+ {
+ ID = getID,
+ ProjectId = projectId,
+ DeleteUser = item["DeleteUser"].ToString(),
+ DeleteDate = Funs.GetNewDateTime(item["DeleteDate"].ToString()),
+ DeleteTag = item["DeleteTag"].ToString(),
+ RecordName = item["RecordName"].ToString(),
+ TrainType = item["TrainType"].ToString(),
+ PaperMode = item["PaperMode"].ToString(),
+ TrainMode = item["TrainMode"].ToString(),
+ TrainPrincipal = item["TrainPrincipal"].ToString(),
+ TrainStartDate = Funs.GetNewDateTime(item["TrainStartDate"].ToString()),
+ TrainEndDate = Funs.GetNewDateTime(item["TrainEndDate"].ToString()),
+ TrainContent = item["TrainContent"].ToString(),
+ TrainDescript = item["TrainDescript"].ToString(),
+ TrainPeriod = item["TrainPeriod"].ToString(),
+ PersonCount = Funs.GetNewInt(item["PersonCount"].ToString()),
+ PassedCount = Funs.GetNewInt(item["PassedCount"].ToString()),
+ CoverImg = item["CoverImg"].ToString(),
+ DemandID = item["DemandID"].ToString(),
+ CourseCount = Funs.GetNewInt(item["CourseCount"].ToString()),
+ CourseDuration = item["CourseDuration"].ToString(),
+ Source = item["Source"].ToString(),
+ Description = item["Description"].ToString(),
+ DeviceNo = item["DeviceNo"].ToString(),
+ OwnerDepartId = item["OwnerDepartId"].ToString(),
+ UploadTime = Funs.GetNewDateTime(item["UploadTime"].ToString()),
+ OwnerDeptName = item["OwnerDeptName"].ToString(),
+ TrainDepart = item["TrainDepart"].ToString(),
+ CreateDate = Funs.GetNewDateTime(item["CreateDate"].ToString()),
+ CreateUser = item["CreateUser"].ToString(),
+ OperDate = Funs.GetNewDateTime(item["OperDate"].ToString()),
+ OperUser = item["OperUser"].ToString(),
+ };
+ 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,46 +484,56 @@ 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))
{
- Model.Bo_Sheng_TrainPerson newPerson = new Model.Bo_Sheng_TrainPerson
+ if (getTrainPerson == null)
{
- ID = getID,
- ProjectId = projectId,
- DeleteUser = item["DeleteUser"].ToString(),
- DeleteDate =Funs.GetNewDateTime( item["DeleteDate"].ToString()),
- DeleteTag = item["DeleteTag"].ToString(),
- EmpName = item["EmpName"].ToString(),
- IdentifyId = item["IdentifyId"].ToString(),
- Photo = item["Photo"].ToString(),
- Station = item["Station"].ToString(),
- Category = item["Category"].ToString(),
- CategoryName = item["CategoryName"].ToString(),
- RecordId = item["RecordId"].ToString(),
- SignName = item["SignName"].ToString(),
- DepartId = item["DepartId"].ToString(),
- DepartName = item["DepartName"].ToString(),
- SignInDate = Funs.GetNewDateTime(item["SignInDate"].ToString()),
- SignInType = item["SignInType"].ToString(),
- TrainPeriod = item["TrainPeriod"].ToString(),
- State = item["State"].ToString(),
- TotalScore =Funs.GetNewDecimal( item["TotalScore"].ToString()),
- PassScore =Funs.GetNewDecimal( item["PassScore"].ToString()),
- Score = Funs.GetNewDecimal( item["Score"].ToString()),
- IsPass = item["IsPass"].ToString(),
- GroupNo = item["GroupNo"].ToString(),
- ExamNo = item["ExamNo"].ToString(),
- ExamCount = Funs.GetNewInt(item["ExamCount"].ToString()),
- DeviceNo = item["DeviceNo"].ToString(),
- OwnerDepartId = item["OwnerDepartId"].ToString(),
- UploadTime = Funs.GetNewDateTime(item["UploadTime"].ToString()),
- Answers = item["Answers"].ToString(),
- CreateDate = Funs.GetNewDateTime(item["CreateDate"].ToString()),
- CreateUser = item["CreateUser"].ToString(),
- OperDate = Funs.GetNewDateTime(item["OperDate"].ToString()),
- OperUser = item["OperUser"].ToString(),
- };
- insertTrainPersons.Add(newPerson);
+ Model.Bo_Sheng_TrainPerson newPerson = new Model.Bo_Sheng_TrainPerson
+ {
+ ID = getID,
+ ProjectId = projectId,
+ DeleteUser = item["DeleteUser"].ToString(),
+ DeleteDate = Funs.GetNewDateTime(item["DeleteDate"].ToString()),
+ DeleteTag = item["DeleteTag"].ToString(),
+ EmpName = item["EmpName"].ToString(),
+ IdentifyId = item["IdentifyId"].ToString(),
+ Photo = item["Photo"].ToString(),
+ Station = item["Station"].ToString(),
+ Category = item["Category"].ToString(),
+ CategoryName = item["CategoryName"].ToString(),
+ RecordId = item["RecordId"].ToString(),
+ SignName = item["SignName"].ToString(),
+ DepartId = item["DepartId"].ToString(),
+ DepartName = item["DepartName"].ToString(),
+ SignInDate = Funs.GetNewDateTime(item["SignInDate"].ToString()),
+ SignInType = item["SignInType"].ToString(),
+ TrainPeriod = item["TrainPeriod"].ToString(),
+ State = item["State"].ToString(),
+ TotalScore = Funs.GetNewDecimal(item["TotalScore"].ToString()),
+ PassScore = Funs.GetNewDecimal(item["PassScore"].ToString()),
+ Score = Funs.GetNewDecimal(item["Score"].ToString()),
+ IsPass = item["IsPass"].ToString(),
+ GroupNo = item["GroupNo"].ToString(),
+ ExamNo = item["ExamNo"].ToString(),
+ ExamCount = Funs.GetNewInt(item["ExamCount"].ToString()),
+ DeviceNo = item["DeviceNo"].ToString(),
+ OwnerDepartId = item["OwnerDepartId"].ToString(),
+ UploadTime = Funs.GetNewDateTime(item["UploadTime"].ToString()),
+ Answers = item["Answers"].ToString(),
+ CreateDate = Funs.GetNewDateTime(item["CreateDate"].ToString()),
+ CreateUser = item["CreateUser"].ToString(),
+ OperDate = Funs.GetNewDateTime(item["OperDate"].ToString()),
+ OperUser = item["OperUser"].ToString(),
+ };
+ insertTrainPersons.Add(newPerson);
+ }
+ else
+ {
+ getTrainPerson.DeleteUser = item["DeleteUser"].ToString();
+ getTrainPerson.DeleteDate = Funs.GetNewDateTime(item["DeleteDate"].ToString());
+ getTrainPerson.DeleteTag = item["DeleteTag"].ToString();
+ db.SubmitChanges();
+ }
}
}
@@ -532,31 +571,40 @@ 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))
{
- Model.Bo_Sheng_Exam newTrainTest = new Model.Bo_Sheng_Exam
+ if (getExam == null)
{
- ID = getID,
- ProjectId = projectId,
- RecordId = item["RecordId"].ToString(),
- ExamNo = item["ExamNo"].ToString(),
- GroupNo = item["GroupNo"].ToString(),
- CourseID = item["CourseID"].ToString(),
- COrder =Funs.GetNewInt(item["COrder"].ToString()),
- QsnCode = item["QsnCode"].ToString(),
- QsnId = item["QsnId"].ToString(),
- QsnContent = item["QsnContent"].ToString(),
- QsnFileName = item["QsnFileName"].ToString(),
- QsnAnswer = item["QsnAnswer"].ToString(),
- QsnCategory = item["QsnCategory"].ToString(),
- QsnKind = item["QsnKind"].ToString(),
- QsnImportant = item["QsnImportant"].ToString(),
- Description = item["Description"].ToString(),
- Analysis = item["Analysis"].ToString(),
- UploadTime = Funs.GetNewDateTime(item["UploadTime"].ToString()),
- };
+ 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()),
+ QsnCode = item["QsnCode"].ToString(),
+ QsnId = item["QsnId"].ToString(),
+ QsnContent = item["QsnContent"].ToString(),
+ QsnFileName = item["QsnFileName"].ToString(),
+ QsnAnswer = item["QsnAnswer"].ToString(),
+ QsnCategory = item["QsnCategory"].ToString(),
+ QsnKind = item["QsnKind"].ToString(),
+ QsnImportant = item["QsnImportant"].ToString(),
+ Description = item["Description"].ToString(),
+ Analysis = item["Analysis"].ToString(),
+ UploadTime = Funs.GetNewDateTime(item["UploadTime"].ToString()),
+ };
- insertExams.Add(newTrainTest);
+ insertExams.Add(newTrainTest);
+ }
+ else
+ {
+ getExam.DeleteTag = item["DeleteTag"].ToString();
+ db.SubmitChanges();
+ }
}
}
@@ -594,41 +642,50 @@ 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))
{
- Model.Bo_Sheng_PersonTrainRecord newRecord = new Model.Bo_Sheng_PersonTrainRecord
+ if (getPersonTrainRecord == null)
{
- ID = getID,
- ProjectId = projectId,
- EmpName = item["EmpName"].ToString(),
- IdentifyId = item["IdentifyId"].ToString(),
- CategoryName = item["CategoryName"].ToString(),
- RecordId = item["RecordId"].ToString(),
- DepartId = item["DepartId"].ToString(),
- DepartName = item["DepartName"].ToString(),
- TrainPeriod = item["TrainPeriod"].ToString(),
- TotalScore = Funs.GetNewDecimal(item["TotalScore"].ToString()),
- PassScore = Funs.GetNewDecimal(item["PassScore"].ToString()),
- Score = Funs.GetNewDecimal(item["Score"].ToString()),
- IsPass = item["IsPass"].ToString(),
- GroupNo = item["GroupNo"].ToString(),
- ExamNo = item["ExamNo"].ToString(),
- ExamCount = item["ExamCount"].ToString(),
- DeviceNo = item["DeviceNo"].ToString(),
- OwnerDepartId = item["OwnerDepartId"].ToString(),
- Answers = item["Answers"].ToString(),
- RecordName = item["RecordName"].ToString(),
- TrainType = item["TrainType"].ToString(),
- PaperMode = item["PaperMode"].ToString(),
- TrainMode = item["TrainMode"].ToString(),
- TrainPrincipal = item["TrainPrincipal"].ToString(),
- TrainStartDate = Funs.GetNewDateTime(item["TrainStartDate"].ToString()),
- TrainEndDate = Funs.GetNewDateTime(item["TrainEndDate"].ToString()),
- TrainContent = item["TrainContent"].ToString(),
- TrainDescript = item["TrainDescript"].ToString(),
- };
+ 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(),
+ RecordId = item["RecordId"].ToString(),
+ DepartId = item["DepartId"].ToString(),
+ DepartName = item["DepartName"].ToString(),
+ TrainPeriod = item["TrainPeriod"].ToString(),
+ TotalScore = Funs.GetNewDecimal(item["TotalScore"].ToString()),
+ PassScore = Funs.GetNewDecimal(item["PassScore"].ToString()),
+ Score = Funs.GetNewDecimal(item["Score"].ToString()),
+ IsPass = item["IsPass"].ToString(),
+ GroupNo = item["GroupNo"].ToString(),
+ ExamNo = item["ExamNo"].ToString(),
+ ExamCount = item["ExamCount"].ToString(),
+ DeviceNo = item["DeviceNo"].ToString(),
+ OwnerDepartId = item["OwnerDepartId"].ToString(),
+ Answers = item["Answers"].ToString(),
+ RecordName = item["RecordName"].ToString(),
+ TrainType = item["TrainType"].ToString(),
+ PaperMode = item["PaperMode"].ToString(),
+ TrainMode = item["TrainMode"].ToString(),
+ TrainPrincipal = item["TrainPrincipal"].ToString(),
+ TrainStartDate = Funs.GetNewDateTime(item["TrainStartDate"].ToString()),
+ TrainEndDate = Funs.GetNewDateTime(item["TrainEndDate"].ToString()),
+ TrainContent = item["TrainContent"].ToString(),
+ TrainDescript = item["TrainDescript"].ToString(),
+ };
- insertPersonTrainRecords.Add(newRecord);
+ insertPersonTrainRecords.Add(newRecord);
+ }
+ else
+ {
+ getPersonTrainRecord.DeleteTag = item["DeleteTag"].ToString();
+ db.SubmitChanges();
+ }
}
}
diff --git a/SGGL/BLL/BoSheng/BOSHENGService.cs b/SGGL/BLL/BoSheng/BOSHENGService.cs
index 6f75f8c4..d8878351 100644
--- a/SGGL/BLL/BoSheng/BOSHENGService.cs
+++ b/SGGL/BLL/BoSheng/BOSHENGService.cs
@@ -22,7 +22,9 @@ namespace BLL
///
/// 定义变量
///
- private static IQueryable getUnits = from x in db.Bo_Sheng_Unit select x;
+ private static IQueryable getUnits = from x in db.Bo_Sheng_Unit
+ where (x.DeleteTag == "True" || x.DeleteTag == null)
+ select x;
///
/// 获取分页列表
@@ -88,7 +90,9 @@ namespace BLL
///
/// 定义变量
///
- private static IQueryable getPersons = from x in db.Bo_Sheng_Person select x;
+ private static IQueryable getPersons = from x in db.Bo_Sheng_Person
+ where (x.DeleteTag == "True" || x.DeleteTag == null)
+ select x;
///
/// 获取分页列表
@@ -195,7 +199,9 @@ namespace BLL
///
/// 定义变量
///
- private static IQueryable getTrains = from x in db.Bo_Sheng_Train select x;
+ private static IQueryable getTrains = from x in db.Bo_Sheng_Train
+ where (x.DeleteTag == "True" || x.DeleteTag == null)
+ select x;
///
/// 获取分页列表
@@ -275,7 +281,9 @@ namespace BLL
///
/// 定义变量
///
- private static IQueryable getTrainPersons = from x in db.Bo_Sheng_TrainPerson select x;
+ private static IQueryable getTrainPersons = from x in db.Bo_Sheng_TrainPerson
+ where (x.DeleteTag == "True" || x.DeleteTag == null)
+ select x;
///
/// 获取分页列表
@@ -361,7 +369,9 @@ namespace BLL
///
/// 定义变量
///
- private static IQueryable getExams = from x in db.Bo_Sheng_Exam select x;
+ private static IQueryable getExams = from x in db.Bo_Sheng_Exam
+ where (x.DeleteTag == "True" || x.DeleteTag == null)
+ select x;
///
/// 获取分页列表
@@ -429,7 +439,9 @@ namespace BLL
///
/// 定义变量
///
- private static IQueryable getPersonTrainRecords = from x in db.Bo_Sheng_PersonTrainRecord select x;
+ private static IQueryable getPersonTrainRecords = from x in db.Bo_Sheng_PersonTrainRecord
+ where (x.DeleteTag == "True" || x.DeleteTag == null)
+ select x;
///
/// 获取分页列表
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index b7e960da..e69de29b 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/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
-
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 9a33d0f3..dcba9d08 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -66,9 +66,9 @@
FakesAssemblies\Apache.NMS.Fakes.dll
-
+
False
- bin\Aspose.Words.dll
+ ..\FineUIPro\Reference BLL\Aspose.Words.dll
..\FineUIPro\Reference BLL\AxInterop.SYNCARDOCXLib.dll
@@ -93,7 +93,7 @@
False
- ..\packages\Newtonsoft.Json.12.0.1\lib\net40\Newtonsoft.Json.dll
+ ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll
..\packages\NPOI.2.5.5\lib\net45\NPOI.dll
@@ -16736,7 +16736,7 @@
0
- http://localhost:9733/
+ http://localhost:8579/
False
False
diff --git a/SGGL/FineUIPro/Reference BLL/Aspose.Words.dll b/SGGL/FineUIPro/Reference BLL/Aspose.Words.dll
index bb4eaeb0..3f934eb0 100644
Binary files a/SGGL/FineUIPro/Reference BLL/Aspose.Words.dll and b/SGGL/FineUIPro/Reference BLL/Aspose.Words.dll differ
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index ba18af2c..0696af47 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -44007,6 +44007,8 @@ namespace Model
private System.Nullable _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 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;
private EntityRef _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
{