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

1

Browse Source
This commit is contained in:
高飞
2026-04-07 16:57:01 +08:00
parent 8cb99d48f5 70315a3da8
commit 21bd80e1ea
14 changed files with 346 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/APIPersonService.cs
+26
View File
@@ -1517,5 +1517,31 @@ namespace BLL
return strValues;
}
public static string getStrTrainingTestRecordByPersonId(string personId)
{
string strValues = string.Empty;
var getDataLists = from x in Funs.DB.Training_TestRecord
join z in Funs.DB.Training_TestPlan on x.TestPlanId equals z.TestPlanId
where x.TestManId == personId
orderby z.PlanDate descending
select new
{
z.PlanName,
z.PlanDate,
CheckResultName = x.TestScores >=60 ? "合格" : "不合格",
z.TestPlanId,
};
if (getDataLists.Count() > 0)
{
foreach (var item in getDataLists)
{
string strV = string.Format("{0:yyyy-MM-dd HH:mm}", item.PlanDate) + " " + item.PlanName + " " + item.CheckResultName + "；";
strValues += strV;
}
}
return strValues;
}
}
}
SGGL/BLL/CLGL/TwArrivalStatisticsService.cs
+5 -4
View File
@@ -1,5 +1,6 @@
using Model;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -125,9 +126,7 @@ namespace BLL
{
var twPipeMatMatchOutputs = new List<Tw_PipeMatMatchOutput>();
var pipelineModel = PipelineService.GetPipelineByPipelineId(pipelineId);
string warehouseCode = PipelineService
.GetPipeArea().FirstOrDefault(x => x.Value == pipelineModel.PipeArea.ToString())
?.Text;
string warehouseCode = BLL.Base_WarehouseService.GetWarehouseByWarehouseId(PipelineService.GetPipelineByPipelineId(pipelineModel.PipelineId).WarehouseId).WarehouseName;
// 获取所需材料列表
var requiredMaterials = (from x in db.HJGL_PipeLineMat
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
@@ -152,7 +151,9 @@ namespace BLL
).ToList();
twPipeMatMatchOutputs = GetMatMatchOutput(requiredMaterials, warehouseCode, pipelineModel.ProjectId);
var result = twPipeMatMatchOutputs.Count == 0 ? 0 : twPipeMatMatchOutputs.Sum(x => x.MatchRate) / twPipeMatMatchOutputs.Count;
var result = twPipeMatMatchOutputs.Any()
? twPipeMatMatchOutputs.Average(x => x.MatchRate)
: 0;
return result;
}
}
SGGL/BLL/CLGL/TwInOutplanmasterService.cs
+2 -2
View File
@@ -750,7 +750,7 @@ namespace BLL
ProjectId = weldTask.ProjectId,
// CusBillCode = string.Format("{0:yyyyMMdd}", DateTime.Now) + UnitService.GetUnitCodeByUnitId(weldTask.UnitId) + "-" + UnitWorkService.getUnitWorkByUnitWorkId(weldTask.UnitWorkId)?.UnitWorkCode + "AP-PF01",
CusBillCode = TwInOutplanmasterService.GetCusBillCodeByTaskCode(weldTaskCode, TwConst.TypeInt.领料出库, TwConst.Category.管件),
WarehouseCode = PipelineService.GetPipeArea().Where(x => x.Value == PipelineService.GetPipelineByPipelineId(weldTask.PipelineId).PipeArea).Select(x => x.Text).FirstOrDefault(),
WarehouseCode = BLL.Base_WarehouseService.GetWarehouseByWarehouseId(PipelineService.GetPipelineByPipelineId(weldTask.PipelineId).WarehouseId).WarehouseName,
Source = 1,
InOutType = (int)TwConst.InOutType.出库,
TypeInt = (int)TwConst.TypeInt.领料出库,
@@ -789,7 +789,7 @@ namespace BLL
Id = Guid.NewGuid().ToString(),
ProjectId = weldTask.ProjectId,
CusBillCode = TwInOutplanmasterService.GetCusBillCodeByTaskCode(weldTaskCode, TwConst.TypeInt.领料出库, TwConst.Category.管段),
WarehouseCode = PipelineService.GetPipeArea().Where(x => x.Value == PipelineService.GetPipelineByPipelineId(weldTask.PipelineId).PipeArea).Select(x => x.Text).FirstOrDefault(),
WarehouseCode = BLL.Base_WarehouseService.GetWarehouseByWarehouseId(PipelineService.GetPipelineByPipelineId(weldTask.PipelineId).WarehouseId).WarehouseName,
Source = 1,
InOutType = (int)TwConst.InOutType.出库,
TypeInt = (int)TwConst.TypeInt.领料出库,
SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs
+6 -3
View File
@@ -45,7 +45,10 @@ namespace BLL
public static IEnumerable getListData(string projectId, string checkMan, string type, string workAreaName, string responsibilityUnitName, DateTime? startTime, DateTime? endTime, DateTime? startRectificationTime, DateTime? endRectificationTime
, string states, string personId, string unitId, Grid Grid1)
{
IQueryable<Model.View_Hazard_HazardRegisterList> getDataList = getDataLists;
var db= Funs.DB;
IQueryable<Model.View_Hazard_HazardRegisterList> getDataList = from x in db.View_Hazard_HazardRegisterList
where x.ProblemTypes == "1"
select x;
if (!string.IsNullOrEmpty(projectId))
{
getDataList = getDataList.Where(e => e.ProjectId == projectId);
@@ -101,7 +104,7 @@ namespace BLL
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in getDataList
return (from x in getDataList
select new
{
x.HazardRegisterId,
@@ -122,7 +125,7 @@ namespace BLL
x.CheckManName,
x.RegisterDate,
x.StatesStr,
};
}).ToList();
}
#endregion
SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs
+185 -7
View File
@@ -1,4 +1,5 @@
using FineUIPro;
using Model;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -18,12 +19,8 @@ namespace BLL
{
get;
set;
}
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.SitePerson_PersonInOut> getDataLists = from x in Funs.DB.SitePerson_PersonInOut select x;
}
/// <summary>
/// 获取分页列表
@@ -37,7 +34,8 @@ namespace BLL
/// <returns></returns>
public static IEnumerable getListData(string projectId, string unitId, string name, string idCard, string inOutWay, DateTime? startDate, DateTime? endDate, Grid Grid1)
{
IQueryable<Model.SitePerson_PersonInOut> getDataList = getDataLists.Where(x => x.ProjectId == projectId && (inOutWay == "0" || x.InOutWay == inOutWay));
IQueryable<Model.SitePerson_PersonInOut> getDataList = from x in Funs.DB.SitePerson_PersonInOut select x;
getDataList = getDataList.Where(x => x.ProjectId == projectId && (inOutWay == "0" || x.InOutWay == inOutWay));
if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null)
{
getDataList = getDataList.Where(e => e.UnitId == unitId);
@@ -183,6 +181,88 @@ namespace BLL
}
}
}
public static void AddPersonInOut(List<Model.SitePerson_PersonInOut> personInOutList)
{
using (Model.SGGLDB db1 = new Model.SGGLDB(Funs.ConnString))
{
List<string> personIds = new List<string>();
List<SitePerson_PersonInOut> newPersonInOutList = new List<SitePerson_PersonInOut>();
List<SitePerson_PersonInOut> needInsertPersonInOutList = new List<SitePerson_PersonInOut>();
foreach (var personInOut in personInOutList)
{
Model.SitePerson_PersonInOut newPersonInOut = new Model.SitePerson_PersonInOut
{
PersonInOutId = SQLHelper.GetNewID(),
IsIn = personInOut.IsIn ?? true,
ChangeTime = personInOut.ChangeTime,
InOutWay = personInOut.InOutWay ?? Const.InOutWay_Other,
WorkAreaId = personInOut.WorkAreaId,
WorkAreaName = personInOut.WorkAreaName,
OldID = personInOut.OldID,
Address = personInOut.Address,
Remark = personInOut.Remark,
};
if (!string.IsNullOrEmpty(personInOut.PersonId))
{
personIds.Add(personInOut.PersonId);
}
if (!string.IsNullOrEmpty(personInOut.IdentityCard))
{
personIds.Add(personInOut.IdentityCard);
}
newPersonInOutList.Add(personInOut);
}
List<Model.SitePerson_Person> person_Peoples = new List<Model.SitePerson_Person>();
person_Peoples.AddRange(db1.SitePerson_Person.Where(x => x.ProjectId == personInOutList[0].ProjectId && personIds.Contains(x.PersonId)).ToList());
person_Peoples.AddRange(db1.SitePerson_Person.Where(x => x.ProjectId == personInOutList[0].ProjectId && personIds.Contains(x.IdentityCard)).ToList());
foreach (var newPersonInOut in newPersonInOutList)
{
Model.SitePerson_Person getPerson = new Model.SitePerson_Person();
getPerson = person_Peoples.FirstOrDefault(x => x.PersonId == newPersonInOut.PersonId || x.IdentityCard == newPersonInOut.IdentityCard);
if (getPerson != null && !string.IsNullOrEmpty(getPerson.PersonId))
{
newPersonInOut.ProjectId = getPerson.ProjectId;
newPersonInOut.PersonId = getPerson.PersonId;
newPersonInOut.PersonName = getPerson.PersonName;
newPersonInOut.IdentityCard = getPerson.IdentityCard;
newPersonInOut.UnitId = getPerson.UnitId;
newPersonInOut.UnitName = UnitService.GetUnitNameByUnitId(getPerson.UnitId);
newPersonInOut.WorkPostId = getPerson.WorkPostId;
if (!string.IsNullOrEmpty(getPerson.WorkPostId))
{
var getWorkPost = WorkPostService.GetWorkPostById(getPerson.WorkPostId);
if (getWorkPost != null)
{
newPersonInOut.WorkPostName = getWorkPost.WorkPostName;
newPersonInOut.PostType = getWorkPost.PostType;
}
}
if (string.IsNullOrEmpty(newPersonInOut.WorkAreaName) && !string.IsNullOrEmpty(newPersonInOut.WorkAreaId))
{
newPersonInOut.WorkAreaName = UnitWorkService.GetUnitWorkName(newPersonInOut.WorkAreaId);
}
}
if (!getPerson.OutTime.HasValue || getPerson.OutTime > DateTime.Now)
{
//// 插入当日记录表
needInsertPersonInOutList.Add(newPersonInOut);
}
}
db1.SitePerson_PersonInOut.InsertAllOnSubmit(newPersonInOutList);
db1.SubmitChanges();
if (needInsertPersonInOutList.Count>0)
{
//// 插入当日记录表
PersonInOutService.InsertPersonInOutNowNow(needInsertPersonInOutList);
}
}
}
#endregion
#region 插入当日出入记录表
@@ -273,6 +353,104 @@ namespace BLL
}
}
}
public static void InsertPersonInOutNowNow(List<Model.SitePerson_PersonInOut> PersonInOuts)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
List<string> unitIds = new List<string>();
List<SitePerson_PersonInOutNow> newPersonInOutList = new List<SitePerson_PersonInOutNow>();
foreach (var PersonInOut in PersonInOuts)
{
Model.SitePerson_PersonInOutNow newPersonInOut = new Model.SitePerson_PersonInOutNow
{
PersonInOutId = PersonInOut.PersonInOutId,
ProjectId = PersonInOut.ProjectId,
UnitId = PersonInOut.UnitId,
UnitName = PersonInOut.UnitName,
PersonId = PersonInOut.PersonId,
PersonName = PersonInOut.PersonName,
IsIn = PersonInOut.IsIn,
ChangeTime = PersonInOut.ChangeTime,
WorkPostId = PersonInOut.WorkPostId,
WorkPostName = PersonInOut.WorkPostName,
PostType = PersonInOut.PostType,
Name = PersonInOut.PersonName,
IdentityCard = PersonInOut.IdentityCard,
IdcardNumber = PersonInOut.IdentityCard,
CheckType = "ZHENGCHANG_KAOQINLEIBIE",
CheckWay = "FACE_FANGSHI",
InOutWay = PersonInOut.InOutWay,
Address = PersonInOut.Address,
Remark = PersonInOut.Remark,
};
unitIds.Add(PersonInOut.UnitId);
newPersonInOutList.Add(newPersonInOut);
}
db.SitePerson_PersonInOutNow.InsertAllOnSubmit(newPersonInOutList);
db.SubmitChanges();
string proCode = ProjectService.GetContractNoByProjectId(PersonInOuts[0].ProjectId);
var getRealNameP = db.RealName_Project.FirstOrDefault(x => x.ProCode == proCode);
/// 监理 业主 不进入
var getPUnitS = db.Project_ProjectUnit.Where(x => x.ProjectId == PersonInOuts[0].ProjectId && unitIds.Contains(x.UnitId)).ToList();
foreach (var newPersonInOut in newPersonInOutList)
{
var getPUnit = getPUnitS.FirstOrDefault(x => x.UnitId == newPersonInOut.UnitId);
if (getPUnit.UnitType != Const.ProjectUnitType_3 && getPUnit.UnitType != Const.ProjectUnitType_4 && getPUnit.IsSynchro == true)
{
if (getRealNameP != null && newPersonInOut.ChangeTime.HasValue)
{
var getNow = db.RealName_PersonInOutNow.FirstOrDefault(x => x.PersonInOutId == newPersonInOut.PersonInOutId);
if (getNow == null)
{
int hour = newPersonInOut.ChangeTime.Value.Hour;
bool isIn = newPersonInOut.IsIn ?? true;
DateTime date = newPersonInOut.ChangeTime.Value;
var getMorning = db.RealName_PersonInOutNow.FirstOrDefault(x => x.PersonId == newPersonInOut.PersonId
&& ((x.ChangeTime.Value.Hour < 12 && hour < 12) || (x.ChangeTime.Value.Hour >= 12 && hour >= 12))
&& x.ChangeTime >= date.Date && x.ChangeTime.Value < date.Date.AddDays(1)
&& ((x.IsIn == true && x.ChangeTime < date) || (x.IsIn == false && x.ChangeTime > date)));
if (getMorning == null)
{
Model.RealName_PersonInOutNow newR = new Model.RealName_PersonInOutNow
{
PersonInOutId = newPersonInOut.PersonInOutId,
ProjectId = newPersonInOut.ProjectId,
UnitId = newPersonInOut.UnitId,
PersonId = newPersonInOut.PersonId,
IsIn = newPersonInOut.IsIn,
ChangeTime = newPersonInOut.ChangeTime,
WorkPostId = newPersonInOut.WorkPostId,
PostType = newPersonInOut.PostType,
ProCode = proCode,
Name = newPersonInOut.PersonName,
IdcardType = "SHENFEN_ZHENGJIAN",
IdcardNumber = newPersonInOut.IdentityCard,
CheckType = "ZHENGCHANG_KAOQINLEIBIE",
CheckWay = "FACE_FANGSHI",
};
db.RealName_PersonInOutNow.InsertOnSubmit(newR);
}
}
}
}
}
db.SubmitChanges();
var getLastList = from x in db.SitePerson_PersonInOutNow
where x.ChangeTime <= PersonInOuts[0].ChangeTime.Value.AddHours(-48)
select x;
if (getLastList.Count() > 0)
{
db.SitePerson_PersonInOutNow.DeleteAllOnSubmit(getLastList);
db.SubmitChanges();
}
}
}
#endregion
#region 更新人员出入记录