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

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

This commit is contained in:
杨红卫 2023-07-24 17:02:32 +08:00
parent 97207481b2
commit b352d3bd68
7 changed files with 400 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
DataBase/版本日志/SGGLDB_WH_2023-07-24.sql Normal file
View File

@ -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

477
SGGL/BLL/BoSheng/BOSHENGMonitorService.cs
View File

@ -220,66 +220,76 @@ namespace BLL
{ {
string getID = item["ID"].ToString(); string getID = item["ID"].ToString();
var getPerson = db.Bo_Sheng_Person.FirstOrDefault(x => x.ID == getID); 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, Model.Bo_Sheng_Person newPerson = new Model.Bo_Sheng_Person
ProjectId =projectId, {
CreateDate =Funs.GetNewDateTime( item["CreateDate"].ToString()), ID = getID,
CreateUser = item["CreateUser"].ToString(), ProjectId = projectId,
OperDate = Funs.GetNewDateTime(item["OperDate"].ToString()), CreateDate = Funs.GetNewDateTime(item["CreateDate"].ToString()),
OperUser = item["OperUser"].ToString(), CreateUser = item["CreateUser"].ToString(),
DeleteUser = item["DeleteUser"].ToString(), OperDate = Funs.GetNewDateTime(item["OperDate"].ToString()),
DeleteDate = Funs.GetNewDateTime(item["DeleteDate"].ToString()), OperUser = item["OperUser"].ToString(),
DeleteTag = item["DeleteTag"].ToString(), DeleteUser = item["DeleteUser"].ToString(),
Name = item["Name"].ToString(), DeleteDate = Funs.GetNewDateTime(item["DeleteDate"].ToString()),
Sex = item["Sex"].ToString(), DeleteTag = item["DeleteTag"].ToString(),
BirthDay = Funs.GetNewDateTime(item["BirthDay"].ToString()), Name = item["Name"].ToString(),
Address = item["Address"].ToString(), Sex = item["Sex"].ToString(),
Nation = item["Nation"].ToString(), BirthDay = Funs.GetNewDateTime(item["BirthDay"].ToString()),
IdentifyID = item["IdentifyID"].ToString(), Address = item["Address"].ToString(),
Kind = item["Kind"].ToString(), Nation = item["Nation"].ToString(),
Photo = item["Photo"].ToString(), IdentifyID = item["IdentifyID"].ToString(),
Police = item["Police"].ToString(), Kind = item["Kind"].ToString(),
ValidPeriodStart = item["ValidPeriodStart"].ToString(), Photo = item["Photo"].ToString(),
ValidPeriodEnd = item["ValidPeriodEnd"].ToString(), Police = item["Police"].ToString(),
Education = item["Education"].ToString(), ValidPeriodStart = item["ValidPeriodStart"].ToString(),
Native = item["Native"].ToString(), ValidPeriodEnd = item["ValidPeriodEnd"].ToString(),
Telephone = item["Telephone"].ToString(), Education = item["Education"].ToString(),
MaritalStatus = item["MaritalStatus"].ToString(), Native = item["Native"].ToString(),
BloodGroup = item["BloodGroup"].ToString(), Telephone = item["Telephone"].ToString(),
RegisteredType = item["RegisteredType"].ToString(), MaritalStatus = item["MaritalStatus"].ToString(),
Age = Funs.GetNewInt(item["Age"].ToString()), BloodGroup = item["BloodGroup"].ToString(),
JobNumber = item["JobNumber"].ToString(), RegisteredType = item["RegisteredType"].ToString(),
CardContent = item["CardContent"].ToString(), Age = Funs.GetNewInt(item["Age"].ToString()),
ContactTel = item["ContactTel"].ToString(), JobNumber = item["JobNumber"].ToString(),
SecondContacts = item["SecondContacts"].ToString(), CardContent = item["CardContent"].ToString(),
SecondContactsTel = item["SecondContactsTel"].ToString(), ContactTel = item["ContactTel"].ToString(),
NewAddress = item["NewAddress"].ToString(), SecondContacts = item["SecondContacts"].ToString(),
HealthCondition = item["HealthCondition"].ToString(), SecondContactsTel = item["SecondContactsTel"].ToString(),
HealthFile = item["HealthFile"].ToString(), NewAddress = item["NewAddress"].ToString(),
BuildArea = item["BuildArea"].ToString(), HealthCondition = item["HealthCondition"].ToString(),
TraPrincipal = item["TraPrincipal"].ToString(), HealthFile = item["HealthFile"].ToString(),
RegisterDate = Funs.GetNewDateTime(item["RegisterDate"].ToString()), BuildArea = item["BuildArea"].ToString(),
CategoryType = item["CategoryType"].ToString(), TraPrincipal = item["TraPrincipal"].ToString(),
Station = item["Station"].ToString(), RegisterDate = Funs.GetNewDateTime(item["RegisterDate"].ToString()),
Category = item["Category"].ToString(), CategoryType = item["CategoryType"].ToString(),
CategoryLevel = item["CategoryLevel"].ToString(), Station = item["Station"].ToString(),
EntranceDate = Funs.GetNewDateTime(item["EntranceDate"].ToString()), Category = item["Category"].ToString(),
IsOut = item["IsOut"].ToString(), CategoryLevel = item["CategoryLevel"].ToString(),
LeaveDate = Funs.GetNewDateTime(item["LeaveDate"].ToString()), EntranceDate = Funs.GetNewDateTime(item["EntranceDate"].ToString()),
IsBlackList = item["IsBlackList"].ToString(), IsOut = item["IsOut"].ToString(),
AgreementId = item["AgreementId"].ToString(), LeaveDate = Funs.GetNewDateTime(item["LeaveDate"].ToString()),
HasInsurance = item["HasInsurance"].ToString(), IsBlackList = item["IsBlackList"].ToString(),
DeviceNumber = item["DeviceNumber"].ToString(), AgreementId = item["AgreementId"].ToString(),
IsActive = item["IsActive"].ToString(), HasInsurance = item["HasInsurance"].ToString(),
DepartId = item["DepartId"].ToString(), DeviceNumber = item["DeviceNumber"].ToString(),
DepartName = item["DepartName"].ToString(), IsActive = item["IsActive"].ToString(),
OwnerDepartId = item["OwnerDepartId"].ToString(), DepartId = item["DepartId"].ToString(),
UploadTime = Funs.GetNewDateTime(item["UploadTime"].ToString()), DepartName = item["DepartName"].ToString(),
}; OwnerDepartId = item["OwnerDepartId"].ToString(),
insertPersons.Add(newPerson); 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(); string getID = item["ID"].ToString();
var getUnit = db.Bo_Sheng_Unit.FirstOrDefault(x => x.ID == getID); 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, Model.Bo_Sheng_Unit newUnit = new Model.Bo_Sheng_Unit
ProjectId = projectId, {
ParentID = item["ParentID"].ToString(), ID = getID,
DepartCode = item["DepartCode"].ToString(), ProjectId = projectId,
ParentCode = item["ParentCode"].ToString(), DeleteTag = item["DeleteTag"].ToString(),
DepartName = item["DepartName"].ToString(), ParentID = item["ParentID"].ToString(),
DepartType = item["DepartType"].ToString(), DepartCode = item["DepartCode"].ToString(),
DepartShortName = item["DepartShortName"].ToString(), ParentCode = item["ParentCode"].ToString(),
DepartOrder = item["DepartOrder"].ToString(), DepartName = item["DepartName"].ToString(),
State = item["State"].ToString(), DepartType = item["DepartType"].ToString(),
DepartSir = item["DepartSir"].ToString(), DepartShortName = item["DepartShortName"].ToString(),
IsEpiboly = item["IsEpiboly"].ToString(), DepartOrder = item["DepartOrder"].ToString(),
Phone = item["Phone"].ToString(), State = item["State"].ToString(),
Charge = item["Charge"].ToString(), DepartSir = item["DepartSir"].ToString(),
Remark = item["Remark"].ToString(), IsEpiboly = item["IsEpiboly"].ToString(),
OwnerDeptID = item["OwnerDeptID"].ToString(), Phone = item["Phone"].ToString(),
CreateDate = Funs.GetNewDateTime(item["CreateDate"].ToString()), Charge = item["Charge"].ToString(),
CreateUser = item["CreateUser"].ToString(), Remark = item["Remark"].ToString(),
OperDate = Funs.GetNewDateTime(item["OperDate"].ToString()), OwnerDeptID = item["OwnerDeptID"].ToString(),
OperUser = item["OperUser"].ToString(), CreateDate = Funs.GetNewDateTime(item["CreateDate"].ToString()),
}; CreateUser = item["CreateUser"].ToString(),
insertUnits.Add(newUnit); 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) if (insertUnits.Count() > 0)
@ -381,44 +400,54 @@ namespace BLL
{ {
string getID = item["ID"].ToString(); string getID = item["ID"].ToString();
var getTrain = db.Bo_Sheng_Train.FirstOrDefault(x => x.ID == getID); 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, Model.Bo_Sheng_Train newTrainRecord = new Model.Bo_Sheng_Train
ProjectId =projectId, {
DeleteUser = item["DeleteUser"].ToString(), ID = getID,
DeleteDate =Funs.GetNewDateTime( item["DeleteDate"].ToString()), ProjectId = projectId,
DeleteTag = item["DeleteTag"].ToString(), DeleteUser = item["DeleteUser"].ToString(),
RecordName = item["RecordName"].ToString(), DeleteDate = Funs.GetNewDateTime(item["DeleteDate"].ToString()),
TrainType = item["TrainType"].ToString(), DeleteTag = item["DeleteTag"].ToString(),
PaperMode = item["PaperMode"].ToString(), RecordName = item["RecordName"].ToString(),
TrainMode = item["TrainMode"].ToString(), TrainType = item["TrainType"].ToString(),
TrainPrincipal = item["TrainPrincipal"].ToString(), PaperMode = item["PaperMode"].ToString(),
TrainStartDate = Funs.GetNewDateTime(item["TrainStartDate"].ToString()), TrainMode = item["TrainMode"].ToString(),
TrainEndDate = Funs.GetNewDateTime(item["TrainEndDate"].ToString()), TrainPrincipal = item["TrainPrincipal"].ToString(),
TrainContent = item["TrainContent"].ToString(), TrainStartDate = Funs.GetNewDateTime(item["TrainStartDate"].ToString()),
TrainDescript = item["TrainDescript"].ToString(), TrainEndDate = Funs.GetNewDateTime(item["TrainEndDate"].ToString()),
TrainPeriod = item["TrainPeriod"].ToString(), TrainContent = item["TrainContent"].ToString(),
PersonCount = Funs.GetNewInt(item["PersonCount"].ToString()), TrainDescript = item["TrainDescript"].ToString(),
PassedCount = Funs.GetNewInt(item["PassedCount"].ToString()), TrainPeriod = item["TrainPeriod"].ToString(),
CoverImg = item["CoverImg"].ToString(), PersonCount = Funs.GetNewInt(item["PersonCount"].ToString()),
DemandID = item["DemandID"].ToString(), PassedCount = Funs.GetNewInt(item["PassedCount"].ToString()),
CourseCount = Funs.GetNewInt(item["CourseCount"].ToString()), CoverImg = item["CoverImg"].ToString(),
CourseDuration = item["CourseDuration"].ToString(), DemandID = item["DemandID"].ToString(),
Source = item["Source"].ToString(), CourseCount = Funs.GetNewInt(item["CourseCount"].ToString()),
Description = item["Description"].ToString(), CourseDuration = item["CourseDuration"].ToString(),
DeviceNo = item["DeviceNo"].ToString(), Source = item["Source"].ToString(),
OwnerDepartId = item["OwnerDepartId"].ToString(), Description = item["Description"].ToString(),
UploadTime = Funs.GetNewDateTime(item["UploadTime"].ToString()), DeviceNo = item["DeviceNo"].ToString(),
OwnerDeptName = item["OwnerDeptName"].ToString(), OwnerDepartId = item["OwnerDepartId"].ToString(),
TrainDepart = item["TrainDepart"].ToString(), UploadTime = Funs.GetNewDateTime(item["UploadTime"].ToString()),
CreateDate = Funs.GetNewDateTime(item["CreateDate"].ToString()), OwnerDeptName = item["OwnerDeptName"].ToString(),
CreateUser = item["CreateUser"].ToString(), TrainDepart = item["TrainDepart"].ToString(),
OperDate = Funs.GetNewDateTime(item["OperDate"].ToString()), CreateDate = Funs.GetNewDateTime(item["CreateDate"].ToString()),
OperUser = item["OperUser"].ToString(), CreateUser = item["CreateUser"].ToString(),
}; OperDate = Funs.GetNewDateTime(item["OperDate"].ToString()),
insertTrains.Add(newTrainRecord); 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) if (insertTrains.Count() > 0)
@ -455,46 +484,56 @@ namespace BLL
{ {
string getID = item["ID"].ToString(); string getID = item["ID"].ToString();
var getTrainPerson = db.Bo_Sheng_TrainPerson.FirstOrDefault(x => x.ID == getID); 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, Model.Bo_Sheng_TrainPerson newPerson = new Model.Bo_Sheng_TrainPerson
ProjectId = projectId, {
DeleteUser = item["DeleteUser"].ToString(), ID = getID,
DeleteDate =Funs.GetNewDateTime( item["DeleteDate"].ToString()), ProjectId = projectId,
DeleteTag = item["DeleteTag"].ToString(), DeleteUser = item["DeleteUser"].ToString(),
EmpName = item["EmpName"].ToString(), DeleteDate = Funs.GetNewDateTime(item["DeleteDate"].ToString()),
IdentifyId = item["IdentifyId"].ToString(), DeleteTag = item["DeleteTag"].ToString(),
Photo = item["Photo"].ToString(), EmpName = item["EmpName"].ToString(),
Station = item["Station"].ToString(), IdentifyId = item["IdentifyId"].ToString(),
Category = item["Category"].ToString(), Photo = item["Photo"].ToString(),
CategoryName = item["CategoryName"].ToString(), Station = item["Station"].ToString(),
RecordId = item["RecordId"].ToString(), Category = item["Category"].ToString(),
SignName = item["SignName"].ToString(), CategoryName = item["CategoryName"].ToString(),
DepartId = item["DepartId"].ToString(), RecordId = item["RecordId"].ToString(),
DepartName = item["DepartName"].ToString(), SignName = item["SignName"].ToString(),
SignInDate = Funs.GetNewDateTime(item["SignInDate"].ToString()), DepartId = item["DepartId"].ToString(),
SignInType = item["SignInType"].ToString(), DepartName = item["DepartName"].ToString(),
TrainPeriod = item["TrainPeriod"].ToString(), SignInDate = Funs.GetNewDateTime(item["SignInDate"].ToString()),
State = item["State"].ToString(), SignInType = item["SignInType"].ToString(),
TotalScore =Funs.GetNewDecimal( item["TotalScore"].ToString()), TrainPeriod = item["TrainPeriod"].ToString(),
PassScore =Funs.GetNewDecimal( item["PassScore"].ToString()), State = item["State"].ToString(),
Score = Funs.GetNewDecimal( item["Score"].ToString()), TotalScore = Funs.GetNewDecimal(item["TotalScore"].ToString()),
IsPass = item["IsPass"].ToString(), PassScore = Funs.GetNewDecimal(item["PassScore"].ToString()),
GroupNo = item["GroupNo"].ToString(), Score = Funs.GetNewDecimal(item["Score"].ToString()),
ExamNo = item["ExamNo"].ToString(), IsPass = item["IsPass"].ToString(),
ExamCount = Funs.GetNewInt(item["ExamCount"].ToString()), GroupNo = item["GroupNo"].ToString(),
DeviceNo = item["DeviceNo"].ToString(), ExamNo = item["ExamNo"].ToString(),
OwnerDepartId = item["OwnerDepartId"].ToString(), ExamCount = Funs.GetNewInt(item["ExamCount"].ToString()),
UploadTime = Funs.GetNewDateTime(item["UploadTime"].ToString()), DeviceNo = item["DeviceNo"].ToString(),
Answers = item["Answers"].ToString(), OwnerDepartId = item["OwnerDepartId"].ToString(),
CreateDate = Funs.GetNewDateTime(item["CreateDate"].ToString()), UploadTime = Funs.GetNewDateTime(item["UploadTime"].ToString()),
CreateUser = item["CreateUser"].ToString(), Answers = item["Answers"].ToString(),
OperDate = Funs.GetNewDateTime(item["OperDate"].ToString()), CreateDate = Funs.GetNewDateTime(item["CreateDate"].ToString()),
OperUser = item["OperUser"].ToString(), CreateUser = item["CreateUser"].ToString(),
}; OperDate = Funs.GetNewDateTime(item["OperDate"].ToString()),
insertTrainPersons.Add(newPerson); 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(); string getID = item["ID"].ToString();
var getExam = db.Bo_Sheng_Exam.FirstOrDefault(x => x.ID == getID); 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, Model.Bo_Sheng_Exam newTrainTest = new Model.Bo_Sheng_Exam
ProjectId = projectId, {
RecordId = item["RecordId"].ToString(), ID = getID,
ExamNo = item["ExamNo"].ToString(), ProjectId = projectId,
GroupNo = item["GroupNo"].ToString(), DeleteTag = item["DeleteTag"].ToString(),
CourseID = item["CourseID"].ToString(), RecordId = item["RecordId"].ToString(),
COrder =Funs.GetNewInt(item["COrder"].ToString()), ExamNo = item["ExamNo"].ToString(),
QsnCode = item["QsnCode"].ToString(), GroupNo = item["GroupNo"].ToString(),
QsnId = item["QsnId"].ToString(), CourseID = item["CourseID"].ToString(),
QsnContent = item["QsnContent"].ToString(), COrder = Funs.GetNewInt(item["COrder"].ToString()),
QsnFileName = item["QsnFileName"].ToString(), QsnCode = item["QsnCode"].ToString(),
QsnAnswer = item["QsnAnswer"].ToString(), QsnId = item["QsnId"].ToString(),
QsnCategory = item["QsnCategory"].ToString(), QsnContent = item["QsnContent"].ToString(),
QsnKind = item["QsnKind"].ToString(), QsnFileName = item["QsnFileName"].ToString(),
QsnImportant = item["QsnImportant"].ToString(), QsnAnswer = item["QsnAnswer"].ToString(),
Description = item["Description"].ToString(), QsnCategory = item["QsnCategory"].ToString(),
Analysis = item["Analysis"].ToString(), QsnKind = item["QsnKind"].ToString(),
UploadTime = Funs.GetNewDateTime(item["UploadTime"].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(); string getID = item["ID"].ToString();
var getPersonTrainRecord = db.Bo_Sheng_PersonTrainRecord.FirstOrDefault(x => x.ID == getID); 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, Model.Bo_Sheng_PersonTrainRecord newRecord = new Model.Bo_Sheng_PersonTrainRecord
ProjectId = projectId, {
EmpName = item["EmpName"].ToString(), ID = getID,
IdentifyId = item["IdentifyId"].ToString(), ProjectId = projectId,
CategoryName = item["CategoryName"].ToString(), DeleteTag = item["DeleteTag"].ToString(),
RecordId = item["RecordId"].ToString(), EmpName = item["EmpName"].ToString(),
DepartId = item["DepartId"].ToString(), IdentifyId = item["IdentifyId"].ToString(),
DepartName = item["DepartName"].ToString(), CategoryName = item["CategoryName"].ToString(),
TrainPeriod = item["TrainPeriod"].ToString(), RecordId = item["RecordId"].ToString(),
TotalScore = Funs.GetNewDecimal(item["TotalScore"].ToString()), DepartId = item["DepartId"].ToString(),
PassScore = Funs.GetNewDecimal(item["PassScore"].ToString()), DepartName = item["DepartName"].ToString(),
Score = Funs.GetNewDecimal(item["Score"].ToString()), TrainPeriod = item["TrainPeriod"].ToString(),
IsPass = item["IsPass"].ToString(), TotalScore = Funs.GetNewDecimal(item["TotalScore"].ToString()),
GroupNo = item["GroupNo"].ToString(), PassScore = Funs.GetNewDecimal(item["PassScore"].ToString()),
ExamNo = item["ExamNo"].ToString(), Score = Funs.GetNewDecimal(item["Score"].ToString()),
ExamCount = item["ExamCount"].ToString(), IsPass = item["IsPass"].ToString(),
DeviceNo = item["DeviceNo"].ToString(), GroupNo = item["GroupNo"].ToString(),
OwnerDepartId = item["OwnerDepartId"].ToString(), ExamNo = item["ExamNo"].ToString(),
Answers = item["Answers"].ToString(), ExamCount = item["ExamCount"].ToString(),
RecordName = item["RecordName"].ToString(), DeviceNo = item["DeviceNo"].ToString(),
TrainType = item["TrainType"].ToString(), OwnerDepartId = item["OwnerDepartId"].ToString(),
PaperMode = item["PaperMode"].ToString(), Answers = item["Answers"].ToString(),
TrainMode = item["TrainMode"].ToString(), RecordName = item["RecordName"].ToString(),
TrainPrincipal = item["TrainPrincipal"].ToString(), TrainType = item["TrainType"].ToString(),
TrainStartDate = Funs.GetNewDateTime(item["TrainStartDate"].ToString()), PaperMode = item["PaperMode"].ToString(),
TrainEndDate = Funs.GetNewDateTime(item["TrainEndDate"].ToString()), TrainMode = item["TrainMode"].ToString(),
TrainContent = item["TrainContent"].ToString(), TrainPrincipal = item["TrainPrincipal"].ToString(),
TrainDescript = item["TrainDescript"].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();
}
} }
} }

24
SGGL/BLL/BoSheng/BOSHENGService.cs
View File

@ -22,7 +22,9 @@ namespace BLL
/// <summary> /// <summary>
/// 定义变量 /// 定义变量
/// </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> /// <summary>
/// 获取分页列表 /// 获取分页列表
@ -88,7 +90,9 @@ namespace BLL
/// <summary> /// <summary>
/// 定义变量 /// 定义变量
/// </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> /// <summary>
/// 获取分页列表 /// 获取分页列表
@ -195,7 +199,9 @@ namespace BLL
/// <summary> /// <summary>
/// 定义变量 /// 定义变量
/// </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> /// <summary>
/// 获取分页列表 /// 获取分页列表
@ -275,7 +281,9 @@ namespace BLL
/// <summary> /// <summary>
/// 定义变量 /// 定义变量
/// </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> /// <summary>
/// 获取分页列表 /// 获取分页列表
@ -361,7 +369,9 @@ namespace BLL
/// <summary> /// <summary>
/// 定义变量 /// 定义变量
/// </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> /// <summary>
/// 获取分页列表 /// 获取分页列表
@ -429,7 +439,9 @@ namespace BLL
/// <summary> /// <summary>
/// 定义变量 /// 定义变量
/// </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> /// <summary>
/// 获取分页列表 /// 获取分页列表

19
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -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

8
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

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

BIN
SGGL/FineUIPro/Reference BLL/Aspose.Words.dll
View File

Binary file not shown.

120
SGGL/Model/Model.cs
View File

@ -44007,6 +44007,8 @@ namespace Model
private System.Nullable<System.DateTime> _UploadTime; private System.Nullable<System.DateTime> _UploadTime;
private string _DeleteTag;
#region 可扩展性方法定义 #region 可扩展性方法定义
partial void OnLoaded(); partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action); partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -44047,6 +44049,8 @@ namespace Model
partial void OnAnalysisChanged(); partial void OnAnalysisChanged();
partial void OnUploadTimeChanging(System.Nullable<System.DateTime> value); partial void OnUploadTimeChanging(System.Nullable<System.DateTime> value);
partial void OnUploadTimeChanged(); partial void OnUploadTimeChanged();
partial void OnDeleteTagChanging(string value);
partial void OnDeleteTagChanged();
#endregion #endregion
public Bo_Sheng_Exam() 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 PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
@ -45831,6 +45855,8 @@ namespace Model
private string _TrainDescript; private string _TrainDescript;
private string _DeleteTag;
#region 可扩展性方法定义 #region 可扩展性方法定义
partial void OnLoaded(); partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action); partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -45891,6 +45917,8 @@ namespace Model
partial void OnTrainContentChanged(); partial void OnTrainContentChanged();
partial void OnTrainDescriptChanging(string value); partial void OnTrainDescriptChanging(string value);
partial void OnTrainDescriptChanged(); partial void OnTrainDescriptChanged();
partial void OnDeleteTagChanging(string value);
partial void OnDeleteTagChanged();
#endregion #endregion
public Bo_Sheng_PersonTrainRecord() 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 PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
@ -48185,6 +48233,8 @@ namespace Model
private string _OperUser; private string _OperUser;
private string _DeleteTag;
#region 可扩展性方法定义 #region 可扩展性方法定义
partial void OnLoaded(); partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action); partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -48229,6 +48279,8 @@ namespace Model
partial void OnOperDateChanged(); partial void OnOperDateChanged();
partial void OnOperUserChanging(string value); partial void OnOperUserChanging(string value);
partial void OnOperUserChanged(); partial void OnOperUserChanged();
partial void OnDeleteTagChanging(string value);
partial void OnDeleteTagChanged();
#endregion #endregion
public Bo_Sheng_Unit() 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 PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
@ -89579,12 +89651,12 @@ namespace Model
private string _EquipmentOrMatail; private string _EquipmentOrMatail;
private string _Unit;
private string _Status; private string _Status;
private string _AuditMan; private string _AuditMan;
private string _Unit;
private EntityRef<Base_CNProfessional> _Base_CNProfessional; private EntityRef<Base_CNProfessional> _Base_CNProfessional;
private EntityRef<Base_Project> _Base_Project; private EntityRef<Base_Project> _Base_Project;
@ -89635,12 +89707,12 @@ namespace Model
partial void OnAttributeChanged(); partial void OnAttributeChanged();
partial void OnEquipmentOrMatailChanging(string value); partial void OnEquipmentOrMatailChanging(string value);
partial void OnEquipmentOrMatailChanged(); partial void OnEquipmentOrMatailChanged();
partial void OnUnitChanging(string value);
partial void OnUnitChanged();
partial void OnStatusChanging(string value); partial void OnStatusChanging(string value);
partial void OnStatusChanged(); partial void OnStatusChanged();
partial void OnAuditManChanging(string value); partial void OnAuditManChanging(string value);
partial void OnAuditManChanged(); partial void OnAuditManChanged();
partial void OnUnitChanging(string value);
partial void OnUnitChanged();
#endregion #endregion
public Comprehensive_InspectionEquipment() 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)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="NVarChar(2)")]
public string Status 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)] [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 public Base_CNProfessional Base_CNProfessional
{ {