lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
李超 2026-04-23 09:37:02 +08:00
parent da4f6b1b4a 87cb7eb7ba
commit ac6efd332b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SGGL/BLL/HSSE/SitePerson/PersonService.cs
View File

@ -11,7 +11,6 @@ namespace BLL
/// </summary> /// </summary>
public static class PersonService public static class PersonService
{ {
public static Model.SGGLDB db = Funs.DB;
#region 劳务人员列表 #region 劳务人员列表
/// <summary> /// <summary>
@ -26,7 +25,7 @@ namespace BLL
/// <summary> /// <summary>
/// 定义变量 /// 定义变量
/// </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; select x;
/// <summary> /// <summary>
@ -42,6 +41,7 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static IEnumerable getListData(string projetcId, string unitId, string workPostId, string name, string idCard, string states, Grid Grid1) 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); IQueryable<Model.View_SitePerson_Person> getDataList = getDataLists.OrderBy(x => x.ProjectId).ThenBy(x => x.UnitId);
if (!string.IsNullOrEmpty(projetcId) && projetcId != Const._Null) if (!string.IsNullOrEmpty(projetcId) && projetcId != Const._Null)
{ {
@ -113,7 +113,7 @@ namespace BLL
/// <summary> /// <summary>
/// 定义变量 /// 定义变量
/// </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> /// <summary>
/// 获取分页列表 /// 获取分页列表

2
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx
View File

@ -26,7 +26,7 @@
</f:CheckBox> </f:CheckBox>
<f:CheckBox ID="ckbIsAutoFetch" runat="server" Label="自动拉取检查数据" Text="是否启用" LabelWidth="200"> <f:CheckBox ID="ckbIsAutoFetch" runat="server" Label="自动拉取检查数据" Text="是否启用" LabelWidth="200">
</f:CheckBox> </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> <f:Button runat="server" Text="坐标范围" OnClick="btnSetMap_Click" ID="btnSetMap"></f:Button>
</Items> </Items>
</f:FormRow> </f:FormRow>