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

项目人员信息档案新增、导入补充：机构划分、组织单元、人员分类、员工子组、备注信息

Browse Source
This commit is contained in:
夏菊
2025-08-08 17:54:10 +08:00
parent fd849d42e1
commit 8e4dec9037
212 changed files with 2489 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/HSSE/APIGoodsManageService.cs
+1 -1
View File
@@ -261,7 +261,7 @@ namespace BLL
};
if (setItem.UnitType == "1")
{
newFlowOperate.UnitIds = Const.UnitId_TCC;
newFlowOperate.UnitIds = Const.UnitId_XJYJ;
}
else
{
SGGL/BLL/API/HSSE/APIReceiveFileManagerService.cs
+1 -1
View File
@@ -91,7 +91,7 @@ namespace BLL
}).AsEnumerable();
if (getReceiveFileManagerItem.Count() > 0)
{
if (!string.IsNullOrEmpty(unitId) && unitId != Const.UnitId_TCC)
if (!string.IsNullOrEmpty(unitId) && unitId != Const.UnitId_XJYJ)
{
getReceiveFileManagerItem = getReceiveFileManagerItem.Where(x => x.FileUnitId == unitId || (x.UnitIds != null && x.UnitIds.Contains(unitId)));
}
SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs
+1 -1
View File
@@ -372,7 +372,7 @@ namespace BLL
var startDateD = Funs.GetNewDateTime(startDate);
var endDateD = Funs.GetNewDateTime(endDate);
var getPersons = from x in db.SitePerson_Person
where x.ProjectId == projectId && x.InTime <= startDateD && (!x.OutTime.HasValue) && x.UnitId ==Const.UnitId_TCC
where x.ProjectId == projectId && x.InTime <= startDateD && (!x.OutTime.HasValue) && x.UnitId ==Const.UnitId_XJYJ
select x;
Model.SeDinMonthReport4OtherItem newItem = new Model.SeDinMonthReport4OtherItem
{
SGGL/BLL/API/HSSE/APIServerTestRecordService.cs
+2 -2
View File
@@ -78,13 +78,13 @@ namespace BLL
}
else
{
newTestRecord.UnitId = newTestRecord.UnitId = Const.UnitId_TCC;
newTestRecord.UnitId = newTestRecord.UnitId = Const.UnitId_XJYJ;
}
}
newTestRecord.DepartName = DepartService.getDepartNameById(newTestRecord.DepartId);
newTestRecord.UnitName = UnitService.GetUnitNameByUnitId(newTestRecord.UnitId);
newTestRecord.ProjectName = ProjectService.GetProjectNameByProjectId(newTestRecord.ProjectId);
if (newTestRecord.UnitId == Const.UnitId_TCC)
if (newTestRecord.UnitId == Const.UnitId_XJYJ)
{
newTestRecord.IsThiUnit = true;
}