lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20230324新增集团查看数据跳转页面、现场人员卡号补漏按钮功能

Browse Source
This commit is contained in:
杨红卫
2023-03-24 18:03:17 +08:00
parent 8b0c9fdef0
commit a9feacd3d2
123 changed files with 26137 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/BaseInfo/TrainTypeService.cs
+3 -1
View File
@@ -34,7 +34,8 @@ namespace BLL
TrainTypeName = trainType.TrainTypeName,
Remark = trainType.Remark,
IsAboutSendCard = trainType.IsAboutSendCard,
IsRepeat = trainType.IsRepeat
IsRepeat = trainType.IsRepeat,
TrainType=trainType.TrainType,
};
db.Base_TrainType.InsertOnSubmit(newTrainType);
db.SubmitChanges();
@@ -55,6 +56,7 @@ namespace BLL
newTrainType.Remark = trainType.Remark;
newTrainType.IsAboutSendCard = trainType.IsAboutSendCard;
newTrainType.IsRepeat = trainType.IsRepeat;
newTrainType.TrainType = trainType.TrainType;
db.SubmitChanges();
}
}
SGGL/BLL/BaseInfo/WorkPostService.cs
+2
View File
@@ -31,6 +31,7 @@ namespace BLL
WorkPostCode = workPost.WorkPostCode,
WorkPostName = workPost.WorkPostName,
PostType = workPost.PostType,
IsCQMS=workPost.IsCQMS,
IsHsse = workPost.IsHsse,
CNCodes = workPost.CNCodes,
Remark = workPost.Remark
@@ -54,6 +55,7 @@ namespace BLL
newWorkPost.WorkPostName = workPost.WorkPostName;
newWorkPost.PostType = workPost.PostType;
newWorkPost.IsHsse = workPost.IsHsse;
newWorkPost.IsCQMS = workPost.IsCQMS;
newWorkPost.CNCodes = workPost.CNCodes;
newWorkPost.Remark = workPost.Remark;
db.SubmitChanges();
SGGL/BLL/Common/AttachFileService.cs
+16
View File
@@ -149,6 +149,22 @@ namespace BLL
}
/// <summary>
///
/// </summary>
/// <param name="toKeyId"></param>
/// <param name="menuId"></param>
/// <returns></returns>
public static IList<Model.AttachFile> GetBeforeFileList(string toKeyId, string menuId)
{
List<string> listToKeyId = new List<string>();
listToKeyId.Add(toKeyId);
// listToKeyId.Add(toKeyId + "r");
//listToKeyId.Add(toKeyId + "re");
var list = Funs.DB.AttachFile.Where(p => listToKeyId.Contains(p.ToKeyId) && p.MenuId == menuId).ToList();
return list;
}
/// <summary>
///
/// </summary>
SGGL/BLL/Common/Const.cs
+10
View File
@@ -317,6 +317,16 @@
#endregion
#region 内置岗位
/// <summary>
/// 安全总监岗位Id
/// </summary>
public static string WorkPost_HSSEDirector = "8A7C2CDF-AFB5-4826-9951-343253342DAC";
/// <summary>
/// 项目安全总监岗位Id
/// </summary>
public static string WorkPost_ProjectHSSEDirector = "5e6e259e-ea0a-4a63-8f52-df4a19a6c9fa";
/// <summary>
/// HSE工程师岗位Id
/// </summary>
SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
+3 -3
View File
@@ -29,7 +29,7 @@ namespace BLL
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.View_SitePerson_Person> getDataLists = from x in db.View_SitePerson_Person
private static IQueryable<Model.View_SitePerson_Person> getDataLists = from x in Funs.DB.View_SitePerson_Person
select x;
/// <summary>
@@ -637,7 +637,7 @@ namespace BLL
var getSitePerson = GetSitePersonByProjectIdPersonId(projectId, personId);
if (getSitePerson != null && string.IsNullOrEmpty(getSitePerson.CardNo))
{
string prefix = UnitService.GetUnitCodeByUnitId(getSitePerson.UnitId);
string prefix = UnitService.GetUnitCodeByUnitId(getSitePerson.UnitId) + "-";
var getMaxCarNo = Funs.DB.SitePerson_Person.Where(x => x.ProjectId == projectId && x.CardNo.Contains(prefix)).Max(x => x.CardNo);
if (!string.IsNullOrEmpty(getMaxCarNo) && getMaxCarNo.Length > 5)
{
@@ -660,7 +660,7 @@ namespace BLL
var getSitePerson = GetSitePersonById(sitepersinId);
if (getSitePerson != null && string.IsNullOrEmpty(getSitePerson.CardNo))
{
cardNo = SQLHelper.RunProcNewId("SpGetNewNumber", "SitePerson_Person", "CardNo", getSitePerson.ProjectId, UnitService.GetUnitCodeByUnitId(getSitePerson.UnitId));
cardNo = SQLHelper.RunProcNewId("SpGetNewNumber", "SitePerson_Person", "CardNo", getSitePerson.ProjectId, UnitService.GetUnitCodeByUnitId(getSitePerson.UnitId) +"-");
getSitePerson.CardNo = cardNo;
Funs.DB.SubmitChanges();
}