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

20210630

Browse Source
This commit is contained in:
杨红卫
2021-06-30 16:00:32 +08:00
parent 8bc3189f9f
commit 957d206c2b
8 changed files with 209 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/WebAPI/Controllers/DoorServerController.cs
+9 -9
View File
@@ -59,7 +59,7 @@ namespace WebAPI.Controllers
return ("$" + DepartmentID.ToString() + "$" + EmployID.ToString() + "$" + ID.ToString() + "$" + ValidEventID.ToString() + "$");
}
#endregion
#region 保存部门信息
/// <summary>
/// 保存部门信息
@@ -76,7 +76,7 @@ namespace WebAPI.Controllers
{
if (department != null)
{
var getDep = db.T_d_department.FirstOrDefault(x => x.DepartmentID == department.DepartmentID && x.ProjectId ==department.ProjectId);
var getDep = db.T_d_department.FirstOrDefault(x => x.DepartmentID == department.DepartmentID && x.ProjectId == department.ProjectId);
if (getDep == null)
{
Model.T_d_department newDep = new Model.T_d_department()
@@ -128,7 +128,7 @@ namespace WebAPI.Controllers
{
if (employinfo != null)
{
var getEm = db.T_d_employinfo.FirstOrDefault(x => x.EmployID == employinfo.EmployID && x.ProjectId ==employinfo.ProjectId);
var getEm = db.T_d_employinfo.FirstOrDefault(x => x.EmployID == employinfo.EmployID && x.ProjectId == employinfo.ProjectId);
if (getEm == null)
{
Model.T_d_employinfo newEmploy = new Model.T_d_employinfo()
@@ -181,11 +181,11 @@ namespace WebAPI.Controllers
{
if (getDep.ParentID == 0)
{
newEmploy.InstallationId = getDep.DepartmentID;
newEmploy.InstallationId = getDep.DepartmentID;
}
else
{
var getDep0 =BLL.DoorServerService.GetSupDep(newEmploy.ProjectId, getDep.ParentID, 0);
var getDep0 = BLL.DoorServerService.GetSupDep(newEmploy.ProjectId, getDep.ParentID, 0);
if (getDep0 != null)
{
newEmploy.UnitId = newEmploy.GroupID;
@@ -237,7 +237,7 @@ namespace WebAPI.Controllers
{
if (facerecord != null)
{
var getFacerecord = db.T_d_facerecord.FirstOrDefault(x => x.ID == facerecord.ID && x.ProjectId == facerecord.ProjectId && x.RoleID ==facerecord.RoleID);
var getFacerecord = db.T_d_facerecord.FirstOrDefault(x => x.ID == facerecord.ID && x.ProjectId == facerecord.ProjectId && x.RoleID == facerecord.RoleID);
if (getFacerecord == null)
{
Model.T_d_facerecord newFacerecord = new Model.T_d_facerecord()
@@ -444,7 +444,7 @@ namespace WebAPI.Controllers
{
string unitId = null;
string postId = null;
responeData.data = Funs.DB.spInOutManHoursReport(projectId, unitId, postId, startDate, endDate).ToList();
responeData.data = Funs.DB.spInOutManHoursReport(projectId, unitId, postId, startDate, endDate).ToList();
}
catch (Exception ex)
{
@@ -462,13 +462,13 @@ namespace WebAPI.Controllers
/// <param name="startDate"></param>
/// <param name="endDate"></param>
/// <returns></returns>
public Model.ResponeData getUnitSumInOutstatistics(string projectId, string unitId,DateTime startDate, DateTime endDate)
public Model.ResponeData getUnitSumInOutstatistics(string projectId, string unitId, DateTime startDate, DateTime endDate)
{
var responeData = new Model.ResponeData();
try
{
string postId = null;
var getData= Funs.DB.spInOutManHoursReport(projectId, unitId, postId, startDate, endDate).ToList();
var getData = Funs.DB.spInOutManHoursReport(projectId, unitId, postId, startDate, endDate).ToList();
responeData.data = getData.Sum(x => x.ManCountSum);
}
catch (Exception ex)