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

1

Browse Source
This commit is contained in:
高飞
2025-12-26 10:53:38 +08:00
parent 70f08c69ab 8fe384bb6a
commit 2b54ca1530
13 changed files with 584 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/APIPersonService.cs
+163
View File
@@ -293,6 +293,119 @@ namespace BLL
}
#endregion
#region 根据条件获取项目人员信息（支持多条件过滤）
/// <summary>
/// 根据条件获取项目人员信息（支持多条件过滤）
/// </summary>
/// <param name="filter">查询过滤条件</param>
/// <returns></returns>
public static List<Model.ProjectPersonOutput> getPersonByFilter(Model.ProjectPersonInput filter)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var query = from x in db.View_SitePerson_Person
select x;
// 添加过滤条件
if (filter != null)
{
// 项目ID过滤
if (!string.IsNullOrEmpty(filter.ProjectId))
{
query = query.Where(x => x.ProjectId == filter.ProjectId);
}
// 项目名称过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.ProjectName))
{
query = query.Where(x => x.ProjectName.Contains(filter.ProjectName));
}
// 人员ID过滤
if (!string.IsNullOrEmpty(filter.PersonId))
{
query = query.Where(x => x.PersonId == filter.PersonId);
}
// 项目人员ID过滤
if (!string.IsNullOrEmpty(filter.SitePersonId))
{
query = query.Where(x => x.SitePersonId == filter.SitePersonId);
}
// 姓名过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.PersonName))
{
query = query.Where(x => x.PersonName.Contains(filter.PersonName));
}
// 身份证号过滤
if (!string.IsNullOrEmpty(filter.IdentityCard))
{
query = query.Where(x => x.IdentityCard == filter.IdentityCard);
}
// 卡号过滤
if (!string.IsNullOrEmpty(filter.CardNo))
{
query = query.Where(x => x.CardNo == filter.CardNo);
}
// 单位名称过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.UnitName))
{
query = query.Where(x => x.UnitName.Contains(filter.UnitName));
}
// 班组名称过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.TeamGroupName))
{
query = query.Where(x => x.TeamGroupName.Contains(filter.TeamGroupName));
}
// 岗位名称过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.WorkPostName))
{
query = query.Where(x => x.WorkPostName.Contains(filter.WorkPostName));
}
}
// 默认只返回在岗人员
query = query.Where(x => x.States == Const.ProjectPersonStates_1);
var persons = from x in query orderby x.CardNo descending
select new Model.ProjectPersonOutput
{
PersonId = x.PersonId,
SitePersonId = x.SitePersonId,
CardNo = x.CardNo,
PersonName = x.PersonName,
SexName = x.SexName,
IdentityCard = x.IdentityCard,
ProjectId = x.ProjectId,
ProjectName = x.ProjectName,
UnitId = x.UnitId,
UnitName = x.UnitName,
TeamGroupName = x.TeamGroupName,
WorkPostName = x.WorkPostName,
InTime = string.Format("{0:yyyy-MM-dd}", x.InTime),
OutTime = string.Format("{0:yyyy-MM-dd}", x.OutTime),
OutResult = x.OutResult,
Telephone = x.Telephone,
PhotoUrl = x.PhotoUrl,
DepartName = x.DepartName,
WorkAreaName = x.WorkAreaName,
PostType = x.PostType,
PersonType = x.PersonType,
PersonTypeName = x.PersonType == "2" ? "外聘" : (x.PersonType == "3" ? "第三方" : "员工"),
PostTypeName = db.Sys_Const.FirstOrDefault(z => z.GroupId == ConstValue.Group_PostType && z.ConstValue == x.PostType).ConstText,
};
return persons.ToList();
}
}
#endregion
#region 获取在岗、离岗、待审人员列表
/// <summary>
/// 记录数
@@ -986,6 +1099,56 @@ namespace BLL
}
#endregion
#region 根据条件获取人员出入场记录（支持多条件过滤）
/// <summary>
/// 根据条件获取人员出入场记录（支持多条件过滤）
/// </summary>
/// <param name="filter">查询过滤条件</param>
/// <returns></returns>
public static List<Model.PersonInOutItem> getPersonInOutListByFilter(Model.PersonInOutRecordInput filter)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var query = from x in db.SitePerson_PersonInOut
join y in db.SitePerson_Person on x.PersonId equals y.PersonId
join z in db.Base_Project on x.ProjectId equals z.ProjectId
where x.ChangeTime >= filter.StartTime && x.ChangeTime <= filter.EndTime && z.ProjectName.Contains(filter.ProjectName)
select new Model.PersonInOutItem
{
PersonId = x.PersonId,
PersonName = y.PersonName,
ProjectId = x.ProjectId,
UnitId = y.UnitId,
UnitName = db.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName,
WorkPostId = y.WorkPostId,
WorkPostName = db.Base_WorkPost.First(z => z.WorkPostId == y.WorkPostId).WorkPostName,
IsIn = x.IsIn,
IsInName = x.IsIn == true ? "进场" : "出场",
ChangeTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ChangeTime),
ChangeTimeD = x.ChangeTime,
};
// 添加过滤条件
if (filter != null)
{
// 单位名称过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.UnitName))
{
query = query.Where(x => x.UnitName.Contains(filter.UnitName));
}
// 人员姓名过滤（模糊查询）
if (!string.IsNullOrEmpty(filter.PersonName))
{
query = query.Where(x => x.PersonName.Contains(filter.PersonName));
}
}
return query.OrderByDescending(x => x.ChangeTimeD).ToList();
}
}
#endregion
#region 根据identityCard获取人员资质信息
/// <summary>
/// 根据identityCard获取人员资质信息
SGGL/BLL/DropListService.cs
+9 -6
View File
@@ -463,12 +463,15 @@ namespace BLL
/// <returns></returns>
public static ListItem[] GetBidType()
{
ListItem[] list = new ListItem[5];
list[0] = new ListItem("招标", "公开招标");
list[1] = new ListItem("谈判", "邀请招标");
list[2] = new ListItem("询比 ", "询比价");
list[3] = new ListItem("竞价", "竞争性谈判");
list[4] = new ListItem("直接分包", "单一来源");
ListItem[] list = new ListItem[8];
list[0] = new ListItem("公开招标", "公开招标");
list[1] = new ListItem("邀请招标", "邀请招标");
list[2] = new ListItem("公开询比 ", "公开询比");
list[3] = new ListItem("邀请询比 ", "邀请询比");
list[4] = new ListItem("公开谈判", "公开谈判");
list[5] = new ListItem("邀请谈判", "邀请谈判");
list[6] = new ListItem("竞价", "竞价");
list[7] = new ListItem("直接分包", "直接分包");
return list;
}
SGGL/BLL/PHTGL/BiddingManagement/BidDocumentsReviewService.cs
+2 -2
View File
@@ -127,8 +127,8 @@ namespace BLL
/// <param name="isShowPlease">是否显示请选择</param>
public static void InitGetBidTypeDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
{
dropName.DataValueField = "Text";
dropName.DataTextField = "Value";
dropName.DataValueField = "Value";
dropName.DataTextField = "Text";
dropName.DataSource = BLL.DropListService.GetBidType();
dropName.DataBind();
if (isShowPlease)
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+1 -33
View File
@@ -496,10 +496,6 @@
<Content Include="CQMS\Plan\TechnicalProposalReview.aspx" />
<Content Include="CQMS\Plan\TechnicalProposalReviewEdit.aspx" />
<Content Include="CQMS\Plan\TechnicalProposalReviewView.aspx" />
<Content Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePic.aspx" />
<Content Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePicEdit.aspx" />
<Content Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePicReport.aspx" />
<Content Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSiteType.aspx" />
<Content Include="CQMS\QualityActivity\QCManage\QCGroupRegistration.aspx" />
<Content Include="CQMS\QualityActivity\QCManage\QCGroupRegistrationEdit.aspx" />
<Content Include="CQMS\QualityActivity\QCManage\QCGroupRegistrationView.aspx" />
@@ -9232,34 +9228,6 @@
<Compile Include="CQMS\Plan\TechnicalProposalReviewView.aspx.designer.cs">
<DependentUpon>TechnicalProposalReviewView.aspx</DependentUpon>
</Compile>
<Compile Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePic.aspx.cs">
<DependentUpon>ProjectHighlightsSitePic.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePic.aspx.designer.cs">
<DependentUpon>ProjectHighlightsSitePic.aspx</DependentUpon>
</Compile>
<Compile Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePicEdit.aspx.cs">
<DependentUpon>ProjectHighlightsSitePicEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePicEdit.aspx.designer.cs">
<DependentUpon>ProjectHighlightsSitePicEdit.aspx</DependentUpon>
</Compile>
<Compile Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePicReport.aspx.cs">
<DependentUpon>ProjectHighlightsSitePicReport.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePicReport.aspx.designer.cs">
<DependentUpon>ProjectHighlightsSitePicReport.aspx</DependentUpon>
</Compile>
<Compile Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSiteType.aspx.cs">
<DependentUpon>ProjectHighlightsSiteType.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSiteType.aspx.designer.cs">
<DependentUpon>ProjectHighlightsSiteType.aspx</DependentUpon>
</Compile>
<Compile Include="CQMS\QualityActivity\QCManage\QCGroupRegistration.aspx.cs">
<DependentUpon>QCGroupRegistration.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -16894,7 +16862,7 @@
</COMReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
SGGL/FineUIPro.Web/ProjectData/ProjectDevices.aspx.cs
+15 -15
View File
@@ -27,9 +27,8 @@ namespace FineUIPro.Web.ProjectData
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
this.BindGrid();
////权限按钮方法
@@ -60,7 +59,7 @@ namespace FineUIPro.Web.ProjectData
tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
Grid1.DataBind();
}
#region 操作 Events
@@ -165,7 +164,7 @@ namespace FineUIPro.Web.ProjectData
return;
}
var device = Funs.DB.Project_Devices.FirstOrDefault(x=>x.DeviceId== Grid1.SelectedRowID) ;
var device = Funs.DB.Project_Devices.FirstOrDefault(x => x.DeviceId == Grid1.SelectedRowID);
if (device != null)
{
var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId);
@@ -201,13 +200,14 @@ namespace FineUIPro.Web.ProjectData
var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId);
var token = YunMouHelper.getToken();
var res = YunMouHelper.addDevicesToGroups(project.YunMouGroupId, new string[] { device.DeviceSerial }, token);//添加到权限组
YunMouHelper.setDefence(device.DeviceSerial,"1",token);
YunMouHelper.setDefence(device.DeviceSerial, "1", token);
if (string.IsNullOrEmpty(res))
{
Alert.ShowInTop("关联权限出错！", MessageBoxIcon.Warning);
}
else {
else
{
device.YunMouPermission = "是";
Funs.DB.SubmitChanges();
ShowNotify("关联成功", MessageBoxIcon.Success);
@@ -215,7 +215,7 @@ namespace FineUIPro.Web.ProjectData
}
}
}
protected void btnMenuDeletePermission_Click(object sender, EventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length == 0)
@@ -255,8 +255,8 @@ namespace FineUIPro.Web.ProjectData
return;
}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectDevicesEdit.aspx?DeviceId={0}", Grid1.SelectedRowID), "编辑项目单位", 800, 300));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectDevicesEdit.aspx?DeviceId={0}", Grid1.SelectedRowID), "编辑项目单位", 800, 300));
}
/// <summary>
@@ -282,18 +282,18 @@ namespace FineUIPro.Web.ProjectData
return;
}
string menuId = BLL.Const.ProjectDevicesMenuId;
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, menuId);
if (buttonList.Count() > 0)
{
if (buttonList.Contains(BLL.Const.BtnAdd))
{
this.btnAdd.Hidden = false;
}
if (buttonList.Contains(BLL.Const.BtnModify))
{
this.btnMenuDeletePermission.Hidden= false;
this.btnMenuDeletePermission.Hidden = false;
this.btnAdd.Hidden = false;
this.btnMenuEdit.Hidden = false;
this.btnMenuDeviceToYunMou.Hidden = false;
@@ -304,7 +304,7 @@ namespace FineUIPro.Web.ProjectData
this.btnMenuDelete.Hidden = false;
}
}
}
#endregion
@@ -320,8 +320,8 @@ namespace FineUIPro.Web.ProjectData
this.BindGrid();
this.GetButtonPower();
}
#endregion
#endregion
}
}
SGGL/FineUIPro.Web/ProjectData/ProjectDevicesEdit.aspx.cs
+14 -11
View File
@@ -6,7 +6,10 @@ using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using BLL;
using BLL.Common;
using BLL.Common;
using FastReport.Cloud.OAuth;
using FineUIPro.Web.DataShow;
using Org.BouncyCastle.Crypto;
namespace FineUIPro.Web.ProjectData
{
@@ -39,11 +42,11 @@ namespace FineUIPro.Web.ProjectData
{
if (!IsPostBack)
{
btnClose.OnClientClick = ActiveWindow.GetHideReference();
btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.DeviceId = Request.Params["DeviceId"];
if (!string.IsNullOrEmpty(this.DeviceId))
{
Model.Project_Devices device = Funs.DB.Project_Devices.FirstOrDefault(x=>x.DeviceId==this.DeviceId);
Model.Project_Devices device = Funs.DB.Project_Devices.FirstOrDefault(x => x.DeviceId == this.DeviceId);
if (device != null)
{
this.txtDeviceName.Text = device.DeviceName;
@@ -59,8 +62,8 @@ namespace FineUIPro.Web.ProjectData
{
this.dpCreateDate.Text = string.Format("{0:yyyy-MM-dd}", device.CreateDate);
}
}
}
}
}
}
@@ -74,15 +77,15 @@ namespace FineUIPro.Web.ProjectData
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
Model.Project_Devices device = new Model.Project_Devices
{
ProjectId = this.CurrUser.LoginProjectId,
DeviceName = this.txtDeviceName.Text.Trim(),
DeviceSerial = this.txtDeviceSerial.Text.Trim(),
Address = txtAddress.Text.Trim(),
ValidateCode=txtValidateCode.Text.Trim(),
ValidateCode = txtValidateCode.Text.Trim(),
CreateDate = Funs.GetNewDateTime(this.dpCreateDate.Text.Trim())
};
if (this.drpInOut.SelectedValue != BLL.Const._Null)
@@ -120,9 +123,9 @@ namespace FineUIPro.Web.ProjectData
}
#endregion
}
}
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx
+1 -6
View File
@@ -30,12 +30,7 @@
</Items>
</f:FormRow>
</Rows>
</f:Form>
</f:Form>
</Items>
</f:GroupPanel>
<f:GroupPanel ID="GroupPanel2" Layout="Anchor" Title="焊接环境设置" runat="server" >
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs
+34 -1
View File
@@ -51,6 +51,35 @@ namespace FineUIPro.Web.common.ProjectSet
ShowNotify("请选择项目！", MessageBoxIcon.Warning);
return;
}
#region 云眸
///通用
var getProject = ProjectService.GetProjectByProjectId(projectId);
if (getProject != null)
{
getProject.IsYunMou = this.ckbIsYunMou.Checked;
if (this.ckbIsYunMou.Checked)
{
var token = YunMouHelper.getToken();
string data;
data = Regex.Replace(getProject.ProjectCode, "[^0-9A-Fa-f]", "", RegexOptions.IgnoreCase);
YunMouHelper.addDevicesGroups(getProject.ProjectName, data, token);
var groupId = YunMouHelper.addPermissionGroups(getProject.ProjectName, token);
if (!string.IsNullOrEmpty(groupId))
{
getProject.YunMouGroupId = groupId;
}
}
else
{
var token = YunMouHelper.getToken();
string data;
data = Regex.Replace(getProject.ProjectCode, "[^0-9A-Fa-f]", "", RegexOptions.IgnoreCase);
YunMouHelper.deleteDevicesGroups(data, token);//删除设备分组，如果有子节点，可以不删除
}
Funs.DB.SubmitChanges();
}
#endregion
#region 焊接
// 焊接
Model.Project_Sys_Set dayReport = BLL.Project_SysSetService.GetSysSetBySetId("1", projectId);
@@ -339,7 +368,11 @@ namespace FineUIPro.Web.common.ProjectSet
SetCheckFromDict(dict, "10", this.ckPressMustCheckBItem);
if (dict.ContainsKey("11")) this.rbMaterialColorAttribute.SelectedValue = dict["11"].SetValue == "1" ? "1" : "2";
}
var getProject = ProjectService.GetProjectByProjectId(projectId);
if (getProject != null && getProject.IsYunMou == true)
{
this.ckbIsYunMou.Checked = true;
}
//颜色模型设置
var m1 = BLL.Project_SysSetService.GetSysSetBySetName("管线未完成", this.CurrUser.LoginProjectId);
if (m1 != null) this.txtPipelineNOComplete.Text = m1.SetValue;
SGGL/Model/HSSE/PersonInOutRecordInput.cs
+35
View File
@@ -0,0 +1,35 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Model
{
/// <summary>
/// 人员出入记录入参
/// </summary>
public class PersonInOutRecordInput
{
/// <summary>
/// 项目名称
/// </summary>
public string ProjectName { get; set; }
/// <summary>
/// 单位名称
/// </summary>
public string UnitName { get; set; }
/// <summary>
/// 人员姓名
/// </summary>
public string PersonName { get; set; }
/// <summary>
/// 开始时间
/// </summary>
public DateTime StartTime { get; set; }
/// <summary>
/// 结束时间
/// </summary>
public DateTime EndTime { get; set; }
}
}
SGGL/Model/HSSE/ProjectPersonInput.cs
+76
View File
@@ -0,0 +1,76 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Model
{
public class ProjectPersonInput
{
/// <summary>
/// 人员主键ID
/// </summary>
public string PersonId { get; set; }
/// <summary>
/// 项目人员主键ID
/// </summary>
public string SitePersonId { get; set; }
/// <summary>
/// 卡号
/// </summary>
public string CardNo { get; set; }
/// <summary>
/// 姓名
/// </summary>
public string PersonName { get; set; }
/// <summary>
/// 身份证号码
/// </summary>
public string IdentityCard { get; set; }
/// <summary>
/// 项目id
/// </summary>
public string ProjectId { get; set; }
/// <summary>
/// 项目名称
/// </summary>
public string ProjectName { get; set; }
/// <summary>
/// 单位名称
/// </summary>
public string UnitName { get; set; }
/// <summary>
/// 班组名称
/// </summary>
public string TeamGroupName { get; set; }
/// <summary>
/// 岗位名称
/// </summary>
public string WorkPostName { get; set; }
/// <summary>
/// 部门名称
/// </summary>
public string DepartName { get; set; }
/// <summary>
/// 岗位类型名称
/// </summary>
public string PostTypeName
{
get;
set;
}
/// <summary>
/// 人员类型
/// </summary>
public string PersonTypeName
{
get;
set;
}
}
}
SGGL/Model/HSSE/ProjectPersonOutput.cs
+124
View File
@@ -0,0 +1,124 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Model
{
public class ProjectPersonOutput
{
/// <summary>
/// 人员主键ID
/// </summary>
public string PersonId { get; set; }
/// <summary>
/// 项目人员主键ID
/// </summary>
public string SitePersonId { get; set; }
/// <summary>
/// 卡号
/// </summary>
public string CardNo { get; set; }
/// <summary>
/// 姓名
/// </summary>
public string PersonName { get; set; }
/// <summary>
/// 性别
/// </summary>
public string SexName { get; set; }
/// <summary>
/// 身份证号码
/// </summary>
public string IdentityCard { get; set; }
/// <summary>
/// 项目id
/// </summary>
public string ProjectId { get; set; }
/// <summary>
/// 项目名称
/// </summary>
public string ProjectName { get; set; }
/// <summary>
/// 单位ID
/// </summary>
public string UnitId { get; set; }
/// <summary>
/// 单位名称
/// </summary>
public string UnitName { get; set; }
/// <summary>
/// 班组名称
/// </summary>
public string TeamGroupName { get; set; }
/// <summary>
/// 岗位名称
/// </summary>
public string WorkPostName { get; set; }
/// <summary>
/// 入场时间
/// </summary>
public string InTime { get; set; }
/// <summary>
/// 出场时间
/// </summary>
public string OutTime { get; set; }
/// <summary>
/// 出场原因
/// </summary>
public string OutResult { get; set; }
/// <summary>
/// 电话
/// </summary>
public string Telephone { get; set; }
/// <summary>
/// 照片路径
/// </summary>
public string PhotoUrl { get; set; }
/// <summary>
/// 部门名称
/// </summary>
public string DepartName { get; set; }
/// <summary>
/// 作业区域名称
/// </summary>
public string WorkAreaName { get; set; }
/// <summary>
/// 岗位类型
/// </summary>
public string PostType
{
get;
set;
}
/// <summary>
/// 岗位类型名称
/// </summary>
public string PostTypeName
{
get;
set;
}
/// <summary>
/// 人员类型
/// </summary>
public string PersonType
{
get;
set;
}
/// <summary>
/// 人员类型
/// </summary>
public string PersonTypeName
{
get;
set;
}
}
}
SGGL/Model/Model.csproj
+3
View File
@@ -252,6 +252,9 @@
<Compile Include="HJGL\TestPackageAnalyzeOutput.cs" />
<Compile Include="HSSE\DigDataHSEDataCollectItem.cs" />
<Compile Include="HSSE\PageDataPersonInOutItem.cs" />
<Compile Include="HSSE\PersonInOutRecordInput.cs" />
<Compile Include="HSSE\ProjectPersonInput.cs" />
<Compile Include="HSSE\ProjectPersonOutput.cs" />
<Compile Include="HSSE\PuApiOutput.cs" />
<Compile Include="HSSE\PuPayCraftAmountInput.cs" />
<Compile Include="HSSE\WorkPostStatisticItem.cs" />
SGGL/WebAPI/Controllers/PersonController.cs
+107 -2
View File
@@ -98,6 +98,52 @@ namespace WebAPI.Controllers
}
#endregion
#region 根据条件获取项目人员信息（支持分页和过滤）
/// <summary>
/// 根据条件获取项目人员信息（支持分页和过滤）
/// </summary>
/// <param name="filter">查询过滤条件（ProjectName为必填参数）</param>
/// <param name="pagesize">每页条数</param>
/// <param name="pageindex">页码（从1开始）</param>
/// <param name="returnAll">是否返回全部数据</param>
/// <returns></returns>
public Model.ResponeData getPersonByFilter([FromUri] Model.ProjectPersonInput filter, int? pagesize = 15, int? pageindex = 1, bool ? returnAll = false)
{
var responeData = new Model.ResponeData();
try
{
// 验证必填参数 ProjectName
if (filter == null || string.IsNullOrEmpty(filter.ProjectName))
{
responeData.code = 0;
responeData.message = "ProjectName为必填参数！";
return responeData;
}
// 处理可空参数的默认值
int actualPagesize = pagesize ?? 15;
int actualPageindex = pageindex ?? 1;
bool actualReturnAll = returnAll ?? false;
var getDataList = APIPersonService.getPersonByFilter(filter);
int pageCount = getDataList.Count;
if (!actualReturnAll && pageCount > 0 && actualPageindex > 0 && actualPagesize > 0)
{
getDataList = getDataList.Skip(actualPagesize * (actualPageindex - 1)).Take(actualPagesize).ToList();
}
responeData.data = new { pageCount, pageindex = actualPageindex, pagesize = actualPagesize, getDataList };
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 获取在岗、离岗、待审人员数量
/// <summary>
/// 获取在岗、离岗、待审人员列表
@@ -970,8 +1016,8 @@ namespace WebAPI.Controllers
#region 根据人员ID获取个人出入场记录
/// <summary>
/// 根据人员ID获取个人出入场记录
/// </summary>
/// <param name="personId"></param>
/// </summary>
/// <param name="personId"></param>
/// <param name="startTime"></param>
/// <param name="endTime"></param>
/// <param name="pageIndex">页码</param>
@@ -998,6 +1044,65 @@ namespace WebAPI.Controllers
}
#endregion
#region 根据条件获取人员出入场记录（支持分页和过滤）
/// <summary>
/// 根据条件获取人员出入场记录（支持分页和过滤）
/// </summary>
/// <param name="filter">查询过滤条件（StartTime和EndTime必填）</param>
/// <param name="pagesize">每页条数</param>
/// <param name="pageindex">页码（从1开始）</param>
/// <param name="returnAll">是否返回全部数据</param>
/// <returns></returns>
public Model.ResponeData getPersonInOutListByFilter([FromUri] Model.PersonInOutRecordInput filter, int? pagesize = 15, int? pageindex = 1, bool? returnAll = false)
{
var responeData = new Model.ResponeData();
try
{
// 验证必填参数
if (filter == null || filter.StartTime == default(DateTime) || filter.EndTime == default(DateTime))
{
responeData.code = 0;
responeData.message = "StartTime和EndTime为必填参数！";
return responeData;
}
// 验证时间范围
if (filter.StartTime > filter.EndTime)
{
responeData.code = 0;
responeData.message = "StartTime不能大于EndTime！";
return responeData;
}
if (filter == null || string.IsNullOrEmpty(filter.ProjectName))
{
responeData.code = 0;
responeData.message = "ProjectName为必填参数！";
return responeData;
}
// 处理可空参数的默认值
int actualPagesize = pagesize ?? 15;
int actualPageindex = pageindex ?? 1;
bool actualReturnAll = returnAll ?? false;
var getDataList = APIPersonService.getPersonInOutListByFilter(filter);
int pageCount = getDataList.Count;
if (!actualReturnAll && pageCount > 0 && actualPageindex > 0 && actualPagesize > 0)
{
getDataList = getDataList.Skip(actualPagesize * (actualPageindex - 1)).Take(actualPagesize).ToList();
}
responeData.data = new { pageCount, pageindex = actualPageindex, pagesize = actualPagesize, getDataList };
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 获取异常人员信息出入场记录
/// <summary>
/// 获取异常人员信息出入场记录