Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN
This commit is contained in:
commit
ac6efd332b
|
|
@ -11,7 +11,6 @@ namespace BLL
|
|||
/// </summary>
|
||||
public static class PersonService
|
||||
{
|
||||
public static Model.SGGLDB db = Funs.DB;
|
||||
|
||||
#region 劳务人员列表
|
||||
/// <summary>
|
||||
|
|
@ -26,7 +25,7 @@ namespace BLL
|
|||
/// <summary>
|
||||
/// 定义变量
|
||||
/// </summary>
|
||||
private static IQueryable<Model.View_SitePerson_Person> getDataLists = from x in db.View_SitePerson_Person
|
||||
private static IQueryable<Model.View_SitePerson_Person> getDataLists = from x in Funs.DB.View_SitePerson_Person
|
||||
select x;
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -42,6 +41,7 @@ namespace BLL
|
|||
/// <returns></returns>
|
||||
public static IEnumerable getListData(string projetcId, string unitId, string workPostId, string name, string idCard, string states, Grid Grid1)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
IQueryable<Model.View_SitePerson_Person> getDataList = getDataLists.OrderBy(x => x.ProjectId).ThenBy(x => x.UnitId);
|
||||
if (!string.IsNullOrEmpty(projetcId) && projetcId != Const._Null)
|
||||
{
|
||||
|
|
@ -113,7 +113,7 @@ namespace BLL
|
|||
/// <summary>
|
||||
/// 定义变量
|
||||
/// </summary>
|
||||
private static IQueryable<Model.View_SitePerson_Person> getPersonLists = from x in db.View_SitePerson_Person select x;
|
||||
private static IQueryable<Model.View_SitePerson_Person> getPersonLists = from x in Funs.DB.View_SitePerson_Person select x;
|
||||
|
||||
/// <summary>
|
||||
/// 获取分页列表
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
</f:CheckBox>
|
||||
<f:CheckBox ID="ckbIsAutoFetch" runat="server" Label="自动拉取检查数据" Text="是否启用" LabelWidth="200">
|
||||
</f:CheckBox>
|
||||
<%--<f:Label runat="server"></f:Label>--%>
|
||||
<f:Label runat="server"></f:Label>
|
||||
<f:Button runat="server" Text="坐标范围" OnClick="btnSetMap_Click" ID="btnSetMap"></f:Button>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
|
|
|
|||
Loading…
Reference in New Issue