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/APIBaseInfoService.cs
+2 -2
View File
@@ -866,11 +866,11 @@ namespace BLL
var tb1 = SQLHelper.GetDataTableRunText(strSql1, null);
string strSql2 = @" select ProjectId,COUNT(1) num from [dbo].[SitePerson_Person]
where IsUsed=1 and (OutTime is null or OutTime>'" + dateZ + "') and UnitId ='"+Const.UnitId_TCC+@"'
where IsUsed=1 and (OutTime is null or OutTime>'" + dateZ + "') and UnitId ='"+Const.UnitId_XJYJ+@"'
group by ProjectId";
var tb2 = SQLHelper.GetDataTableRunText(strSql2, null);
string strSql3 = @"select ProjectId,COUNT(1) num from [dbo].[SitePerson_Person]
where IsUsed=1 and (OutTime is null or OutTime>'" + dateZ + @"') and UnitId !='"+Const.UnitId_TCC+@"'
where IsUsed=1 and (OutTime is null or OutTime>'" + dateZ + @"') and UnitId !='"+Const.UnitId_XJYJ+@"'
group by ProjectId";
var tb3 = SQLHelper.GetDataTableRunText(strSql3, null);
SGGL/BLL/API/APICommonService.cs
+4 -4
View File
@@ -24,8 +24,8 @@ namespace BLL
public static string getaccess_token()
{
string access_token = string.Empty;
string appid = Const.AppID_TCC;
string secret = Const.AppSecret_TCC;
string appid = Const.AppID_XJYJ;
string secret = Const.AppSecret_XJYJ;
//string appid = "wxb5f0e8051b7b9eee";
//string secret = "626175f8860bf84beb4cf507b9445115";
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
@@ -130,8 +130,8 @@ namespace BLL
public static string getUserOpenId(string userId, string jsCode,bool isRefresh = false)
{
string openId = string.Empty;
string appid = Const.AppID_TCC;
string secret = Const.AppSecret_TCC;
string appid = Const.AppID_XJYJ;
string secret = Const.AppSecret_XJYJ;
//string appid = "wxb5f0e8051b7b9eee";
//string secret = "626175f8860bf84beb4cf507b9445115";
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
SGGL/BLL/API/APIPersonService.cs
+3 -3
View File
@@ -347,7 +347,7 @@ namespace BLL
where x.ProjectId == projectId && (strUnitId == null || x.UnitId == strUnitId)
&& (strWorkPostId == null || x.WorkPostId == strWorkPostId)
select x;
if (unitId != Const.UnitId_TCC && !string.IsNullOrEmpty(unitId))
if (unitId != Const.UnitId_XJYJ && !string.IsNullOrEmpty(unitId))
{
getViews = getViews.Where(x => x.UnitId == unitId);
}
@@ -1152,7 +1152,7 @@ namespace BLL
ChangeTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ChangeTime),
ChangeTimeD = x.ChangeTime,
};
if (!string.IsNullOrEmpty(unitId) && unitId != Const.UnitId_TCC)
if (!string.IsNullOrEmpty(unitId) && unitId != Const.UnitId_XJYJ)
{
personInOuts = personInOuts.Where(x => x.UnitId == unitId);
}
@@ -1204,7 +1204,7 @@ namespace BLL
ChangeTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ChangeTime),
ChangeTimeD = x.ChangeTime,
};
if (!string.IsNullOrEmpty(userUnitId) && userUnitId != Const.UnitId_TCC)
if (!string.IsNullOrEmpty(userUnitId) && userUnitId != Const.UnitId_XJYJ)
{
personInOuts = personInOuts.Where(x => x.UnitId == userUnitId);
}
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;
}