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

20221009部门人员当前项目取值来源工作经历。修改在职离职。

This commit is contained in:
杨红卫 2022-10-09 10:41:41 +08:00
parent b1416ebf7e
commit 6533db1bfc
6 changed files with 73 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/BLL/DropListService.cs
View File

@ -138,8 +138,8 @@
public static ListItem[] IsPostDropList()
{
ListItem[] lis = new ListItem[2];
lis[0] = new ListItem("在岗", BLL.Const._True);
lis[1] = new ListItem("离岗", BLL.Const._False);
lis[0] = new ListItem("在职", BLL.Const._True);
lis[1] = new ListItem("离职", BLL.Const._False);
return lis;
}
#endregion

46
SGGL/BLL/Person/Person_PersonsService.cs
View File

@ -112,9 +112,9 @@ namespace BLL
x.RoleIds,
RoleName = RoleService.getRoleNamesRoleIds(x.RoleIds),
x.CurrentProjectId,
CurrentProjectName = db.Base_Project.First(u => u.ProjectId == x.CurrentProjectId).ShortName,
CurrentProjectName = getCurrentProjectName(x.PersonId),
x.CurrentProjectWorkPostId,
CurrentProjectWorkPostName = WorkPostService.getWorkPostNamesWorkPostIds(x.CurrentProjectWorkPostId),
CurrentProjectWorkPostName = getCurrentProjectWorkPostName(x.PersonId),
IsPost = x.IsPost ?? true,
x.SignatureUrl,
x.Address,
@ -139,7 +139,47 @@ namespace BLL
};
}
#endregion
#region 获取当前项目及岗位
/// <summary>
///
/// </summary>
/// <param name="ProjectId"></param>
/// <param name="PersonId"></param>
/// <returns></returns>
public static string getCurrentProjectName(string PersonId)
{
var getItem = Funs.DB.SitePerson_PersonItem.FirstOrDefault(u => u.PersonId == PersonId && !u.OutTime.HasValue);
if (getItem != null)
{
return ProjectService.GetShortNameByProjectId(getItem.ProjectId);
}
else
{
return null;
}
}
/// <summary>
///
/// </summary>
/// <param name="WorkPostId"></param>
/// <param name="PersonId"></param>
/// <returns></returns>
public static string getCurrentProjectWorkPostName( string PersonId)
{
var getItem = Funs.DB.SitePerson_PersonItem.FirstOrDefault(u => u.PersonId == PersonId && !u.OutTime.HasValue);
if (getItem != null)
{
return WorkPostService.getWorkPostNamesWorkPostIds(getItem.WorkPostId);
}
else
{
return null;
}
}
#endregion
#region 根据主键获取人员信息
/// <summary>
/// 根据主键获取人员信息

4
SGGL/FineUIPro.Web/Person/DepartPerson.aspx
View File

@ -95,9 +95,9 @@
<f:RenderField Width="100px" ColumnID="ValidityDate" DataField="ValidityDate"
FieldType="Date" Renderer="Date" HeaderText="合同有效期" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:TemplateField Width="60px" ColumnID="tfIsPost" HeaderText="在岗" HeaderTextAlign="Center" TextAlign="Center">
<f:TemplateField Width="80px" ColumnID="tfIsPost" HeaderText="是否在职" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lbIsPost" runat="server" Text='<%# GetIsOrNo(Eval("IsPost")) %>'></asp:Label>
<asp:Label ID="lbIsPost" runat="server" Text='<%# GetIsPost(Eval("IsPost")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" ColumnID="CurrentProjectName" DataField="CurrentProjectName"

2
SGGL/FineUIPro.Web/Person/PersonLib.aspx
View File

@ -88,7 +88,7 @@
<f:RenderField Width="100px" ColumnID="CurrentProjectWorkPostName" DataField="CurrentProjectWorkPostName"
FieldType="String" HeaderText="项目岗位" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:TemplateField Width="60px" HeaderText="在岗" HeaderTextAlign="Center" TextAlign="Center">
<f:TemplateField Width="60px" HeaderText="是否在职" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lbIsPost" runat="server" Text='<%# GetIsOrNo(Eval("IsPost")) %>'></asp:Label>
</ItemTemplate>

2
SGGL/FineUIPro.Web/Person/ProjectPerson.aspx
View File

@ -50,7 +50,7 @@
<f:RadioItem Text="全部" Value="-2" />
<f:RadioItem Text="在审" Value="0" />
<f:RadioItem Text="在岗" Value="1" Selected="true" />
<f:RadioItem Text="离岗" Value="2" />
<f:RadioItem Text="退场" Value="2" />
<f:RadioItem Text="打回" Value="-1" />
</f:RadioButtonList>
<f:ToolbarFill runat="server">

24
SGGL/FineUIPro.Web/common/PageBase.cs
View File

@ -786,6 +786,30 @@ namespace FineUIPro.Web
}
#endregion
#region 获取是否字面值，在 ASPX 中调用
/// <summary>
///
/// </summary>
/// <param name="bitValue"></param>
/// <returns></returns>
protected string GetIsPost(object bitValue)
{
string value = string.Empty;
if (bitValue != null)
{
if (bitValue.ToString() == "1" || Convert.ToBoolean(bitValue.ToString()))
{
value = "在职";
}
else
{
value = "离职";
}
}
return value;
}
#endregion
#region 获取项目状态的字面值，在 ASPX 中调用
/// <summary>
/// 获取项目状态的字面值，在 ASPX 中调用