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

人员加账号查询、实名制班组同步优化

This commit is contained in:
杨红卫 2023-03-01 16:22:52 +08:00
parent fe2ef7ce70
commit bacfa63c6b
10 changed files with 22 additions and 3671 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,7 @@ namespace BLL
/// <param name="personType">人员类型</param>
/// <param name="Grid1"></param>
/// <returns></returns>
public static IEnumerable getListData(string unitId, string departId, string projetcId, string name, string idCard, string isPost, string personType, Grid Grid1)
public static IEnumerable getListData(string unitId, string departId, string projetcId, string name, string idCard, string isPost, string personType,string account, Grid Grid1)
{
IQueryable<Model.Person_Persons> getDataList = getDataLists.OrderBy(x => x.UnitId).ThenBy(x => x.DepartId);
if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null)
@ -72,6 +72,10 @@ namespace BLL
{
getDataList = getDataList.Where(e => e.PersonName.Contains(name));
}
if (!string.IsNullOrEmpty(account))
{
getDataList = getDataList.Where(e => e.Account.Contains(account));
}
if (!string.IsNullOrEmpty(idCard))
{
getDataList = getDataList.Where(e => e.IdentityCard.Contains(idCard));

2
SGGL/BLL/ZHGL/RealName/SynchroSetService.cs
View File

@ -890,6 +890,7 @@ namespace BLL
var getCollTeam = (from x in Funs.DB.ProjectData_TeamGroup
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
join z in Funs.DB.RealName_Project on y.ContractNo equals z.ProCode
join p in Funs.DB.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { p.UnitId, p.ProjectId }
join u in Funs.DB.Base_Unit on x.UnitId equals u.UnitId
join s in Funs.DB.SitePerson_Person on x.GroupLeaderId equals s.PersonId into jonPerson
from s in jonPerson.DefaultIfEmpty()
@ -897,6 +898,7 @@ namespace BLL
&& (proCode == null || y.ContractNo == proCode)
&& u.CollCropCode != null && u.CollCropCode != ""
&& z.JTproCode != null
&& p.UnitType != Const.ProjectUnitType_3 && p.UnitType != Const.ProjectUnitType_4
select new
{
proCode = z.JTproCode,

3665
SGGL/FineUIPro.Web/ErrLog.txt
View File

File diff suppressed because it is too large Load Diff

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -12820,7 +12820,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:8899/</IISUrl>
<IISUrl>http://localhost:1783/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>

2
SGGL/FineUIPro.Web/Person/CompanyPerson.aspx.cs
View File

@ -39,7 +39,7 @@ namespace FineUIPro.Web.Person
private void BindGrid()
{
var getData = Person_PersonsService.getListData(Const.UnitId_SEDIN, this.drpDepart.SelectedValue, this.drpProject.SelectedValue,
this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue,this.drpPersonType.SelectedValue, Grid1);
this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, null, Grid1);
Grid1.RecordCount = Person_PersonsService.count;
Grid1.DataSource = getData;
Grid1.DataBind();

2
SGGL/FineUIPro.Web/Person/DepartPerson.aspx.cs
View File

@ -90,7 +90,7 @@ namespace FineUIPro.Web.Person
private void BindGrid()
{
var getData = Person_PersonsService.getListData(Const.UnitId_SEDIN, Const.Depart_constructionId, this.drpProject.SelectedValue,
this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, Grid1);
this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, null, Grid1);
Grid1.RecordCount = Person_PersonsService.count;
Grid1.DataSource = getData;
Grid1.DataBind();

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

@ -35,6 +35,7 @@
</f:DropDownList>
<f:TextBox runat="server" ID="txtPersonName" EmptyText="按姓名查询" ></f:TextBox>
<f:TextBox runat="server" ID="txtIdCard" EmptyText="按身份证查询" ></f:TextBox>
<f:TextBox runat="server" ID="txtAccount" EmptyText="按账号查询" ></f:TextBox>
<f:DropDownList runat="server" ID="drpIsPost" EnableEdit="true"
LabelAlign="Right" EmptyText="请选择人员状态" AutoPostBack="true" OnSelectedIndexChanged="btSearch_Click">
</f:DropDownList>

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

@ -43,7 +43,7 @@ namespace FineUIPro.Web.Person
private void BindGrid()
{
var getData = Person_PersonsService.getListData(this.drpUnit.SelectedValue, this.drpDepart.SelectedValue, this.drpProject.SelectedValue,
this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, Grid1);
this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, this.txtAccount.Text.Trim(), Grid1);
Grid1.RecordCount = Person_PersonsService.count;
Grid1.DataSource = getData;
Grid1.DataBind();

9
SGGL/FineUIPro.Web/Person/PersonLib.aspx.designer.cs generated
View File

@ -104,6 +104,15 @@ namespace FineUIPro.Web.Person
/// </remarks>
protected global::FineUIPro.TextBox txtIdCard;
/// <summary>
/// txtAccount 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtAccount;
/// <summary>
/// drpIsPost 控件。
/// </summary>

2
SGGL/FineUIPro.Web/ZHGL/RealName/BasicData.aspx
View File

@ -22,7 +22,7 @@
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1" />
<f:Panel ID="Panel2" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" MarginRight="5px">
<Items>
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="550px" ShowBorder="true"
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" ShowBorder="true" Height="650px"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server"
ActiveTabIndex="0">
<Tabs>