From 330402c752529797c1e6770cca59a0e62470ee2c Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Tue, 14 Jan 2025 09:40:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9D=A3=E6=9F=A5=E4=BA=BA=E5=91=98=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/SysManage/UserService.cs             |   2 +
 SGGL/BLL/WebService/CNCECHSSEWebService.cs    |  32 ++
 SGGL/FineUIPro.Web/SysManage/UserList.aspx    |  29 +-
 SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs |  20 +
 .../SysManage/UserList.aspx.designer.cs       |  59 ++-
 .../FineUIPro.Web/SysManage/UserListEdit.aspx |  57 +--
 .../SysManage/UserListEdit.aspx.cs            |   3 +
 .../SysManage/UserListEdit.aspx.designer.cs   |  67 +--
 .../APIItem/InspectionBrigadeUserItem.cs      |  91 ++++
 SGGL/Model/Model.cs                           | 414 +++---------------
 SGGL/Model/Model.csproj                       |   1 +
 11 files changed, 320 insertions(+), 455 deletions(-)
 create mode 100644 SGGL/Model/APIItem/InspectionBrigadeUserItem.cs

diff --git a/SGGL/BLL/SysManage/UserService.cs b/SGGL/BLL/SysManage/UserService.cs
index 685784b1..02318197 100644
--- a/SGGL/BLL/SysManage/UserService.cs
+++ b/SGGL/BLL/SysManage/UserService.cs
@@ -238,6 +238,7 @@ namespace BLL
                 ViceCNProfessionalId = user.ViceCNProfessionalId,
                 WorkNo = user.WorkNo,
                 HomePageType = user.HomePageType,
+                IsInspectionBrigade = user.IsInspectionBrigade
             };
             db.Sys_User.InsertOnSubmit(newUser);
             db.SubmitChanges();
@@ -319,6 +320,7 @@ namespace BLL
                 newUser.ViceCNProfessionalId = user.ViceCNProfessionalId;
                 newUser.WorkNo = user.WorkNo;
                 newUser.HomePageType = user.HomePageType;
+                newUser.IsInspectionBrigade = user.IsInspectionBrigade;
                 Funs.DB.SubmitChanges();
             }
         }
diff --git a/SGGL/BLL/WebService/CNCECHSSEWebService.cs b/SGGL/BLL/WebService/CNCECHSSEWebService.cs
index c90d4d8b..f17852f2 100644
--- a/SGGL/BLL/WebService/CNCECHSSEWebService.cs
+++ b/SGGL/BLL/WebService/CNCECHSSEWebService.cs
@@ -3604,6 +3604,38 @@
             return responeData.code;
         }
         #endregion
+
+        #region 督查人员推送
+
+        public static int PushInspectionBrigadeUser()
+        {
+
+            string baseurl = "/api/InspectionBrigade/SaveInspectionBrigadeUser";
+            var CollCropCode = BLL.CommonService.GetIsThisUnit()?.CollCropCode;
+            var userList = from x in Funs.DB.Sys_User
+                           where x.IsInspectionBrigade == true
+                           select new Model.InspectionBrigadeUserItem()
+                           {
+
+                               UserId = x.UserId,
+                               UserName = x.UserName,
+                               Sex = x.Sex,
+                               Account = x.Account,
+                               Password = x.Password,
+                               IdentityCard = x.IdentityCard,
+                               Telephone = x.Telephone,
+                               CollCropCode = CollCropCode
+
+                           };
+
+            var resultJsonReport = JsonConvert.SerializeObject(userList.ToList());
+            resultJsonReport = "{\"InspectionBrigadeUserItems\":" + resultJsonReport.Replace("}{", ",") + "}";
+            var responeData = BLL.ServerService.PushCNCEC(resultJsonReport, baseurl);
+            return responeData.code;
+        }
+
+
+        #endregion
     }
 
 
diff --git a/SGGL/FineUIPro.Web/SysManage/UserList.aspx b/SGGL/FineUIPro.Web/SysManage/UserList.aspx
index 76bc48bf..9faf7a56 100644
--- a/SGGL/FineUIPro.Web/SysManage/UserList.aspx
+++ b/SGGL/FineUIPro.Web/SysManage/UserList.aspx
@@ -26,27 +26,30 @@
                     OnRowDoubleClick="Grid1_RowDoubleClick" Width="980px" EnableTextSelection="True">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
-                            <Items>                             
+                            <Items>
                                 <f:TextBox runat="server" Label="姓名" ID="txtUserName" EmptyText="输入查询条件" AutoPostBack="true"
                                     OnTextChanged="TextBox_TextChanged" Width="210px" LabelWidth="50px">
                                 </f:TextBox>
                                 <f:DropDownList ID="drpUnit" runat="server" Label="单位" EnableEdit="true" AutoPostBack="true"
                                     OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="50px">
-                        </f:DropDownList>
+                                </f:DropDownList>
                                 <f:DropDownList ID="drpDepart" runat="server" Label="部门" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
-                            EnableEdit="true" Width="190px" LabelWidth="50px">
-                        </f:DropDownList>
+                                    EnableEdit="true" Width="190px" LabelWidth="50px">
+                                </f:DropDownList>
                                 <f:DropDownList ID="drpRole" runat="server" Label="角色" EnableEdit="true" AutoPostBack="true"
                                     OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="50px">
-                        </f:DropDownList>
+                                </f:DropDownList>
                                 <f:ToolbarFill runat="server">
                                 </f:ToolbarFill>
                                 <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server"
                                     Hidden="true">
                                 </f:Button>
-                                   <f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationAdd" Hidden="true" runat="server"
+                                <f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationAdd" Hidden="true" runat="server"
                                     OnClick="btnImport_Click">
-                            </f:Button>
+                                </f:Button>
+                                <f:Button ID="btnUpdata" Text="推送督查人员" Icon="PageSave" runat="server" ConfirmText="确定推送？"
+                                    ToolTip="推送" ValidateForms="SimpleForm1" OnClick="btnPush_Click" MarginRight="10px">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -57,15 +60,15 @@
                             FieldType="String" HeaderText="姓名" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
-                            FieldType="String" HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left" >
+                            FieldType="String" HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="DepartName" DataField="DepartName" SortField="DepartName"
-                            FieldType="String" HeaderText="部门" HeaderTextAlign="Center" TextAlign="Left" >
+                            FieldType="String" HeaderText="部门" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="110px" ColumnID="Account" DataField="Account" SortField="Account"
                             FieldType="String" HeaderText="账号" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                       <%-- <f:RenderField Width="120px" ColumnID="IdentityCard" DataField="IdentityCard" SortField="IdentityCard"
+                        <%-- <f:RenderField Width="120px" ColumnID="IdentityCard" DataField="IdentityCard" SortField="IdentityCard"
                             FieldType="String" HeaderText="身份证号码" HeaderTextAlign="Center" TextAlign="Right" Hidden="true">
                         </f:RenderField>--%>
                         <f:RenderField Width="150px" ColumnID="RoleName" DataField="RoleName" SortField="RoleName"
@@ -77,7 +80,7 @@
                         <f:CheckBoxField Width="60px" SortField="IsPost" RenderAsStaticField="true" DataField="IsPost"
                             HeaderText="在岗" HeaderTextAlign="Center" TextAlign="Center">
                         </f:CheckBoxField>
-                 <%--       <f:CheckBoxField Width="50px" SortField="IsOffice" RenderAsStaticField="true" DataField="IsOffice"
+                        <%--       <f:CheckBoxField Width="50px" SortField="IsOffice" RenderAsStaticField="true" DataField="IsOffice"
                             HeaderText="本部" HeaderTextAlign="Center" TextAlign="Center">
                         </f:CheckBoxField>--%>
                         <f:TemplateField Width="200px" ColumnID="UserId" HeaderText="参与项目" TextAlign="Left">
@@ -95,7 +98,7 @@
                         <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
                         </f:ToolbarText>
                         <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">                    
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
                         </f:DropDownList>
                     </PageItems>
                 </f:Grid>
@@ -108,7 +111,7 @@
         <f:Window ID="Window2" Title="导入人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="false"
             CloseAction="HidePostBack" Width="1000px" Height="560px">
-    </f:Window>
+        </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
                 Hidden="true" runat="server" Text="编辑" Icon="Pencil">
diff --git a/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs b/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs
index 5171517a..c5f0b65c 100644
--- a/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs
+++ b/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs
@@ -327,5 +327,25 @@
         {
             BindGrid();
         }
+
+        /// <summary>
+        /// 推送督查人员
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnPush_Click(object sender, EventArgs e)
+        {
+            string code = CNCECHSSEWebService.PushInspectionBrigadeUser().ToString();
+            if (code == "1")
+            {
+                ShowNotify("同步成功！", MessageBoxIcon.Success);
+                PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                return;
+            }
+            else
+            {
+                Alert.ShowInParent("同步异常，请退出后重试！", MessageBoxIcon.Error);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/SysManage/UserList.aspx.designer.cs b/SGGL/FineUIPro.Web/SysManage/UserList.aspx.designer.cs
index fcb07c11..316655cd 100644
--- a/SGGL/FineUIPro.Web/SysManage/UserList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/SysManage/UserList.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.SysManage {
-    
-    
-    public partial class UserList {
-        
+namespace FineUIPro.Web.SysManage
+{
+
+
+    public partial class UserList
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtUserName 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtUserName;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// drpDepart 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpDepart;
-        
+
         /// <summary>
         /// drpRole 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpRole;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -110,7 +112,16 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
-        
+
+        /// <summary>
+        /// btnUpdata 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnUpdata;
+
         /// <summary>
         /// lbtnPro 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lbtnPro;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx
index 4a2dc52e..74fc820b 100644
--- a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx
+++ b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx
@@ -14,19 +14,19 @@
             <Rows>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtUserCode" runat="server" Label="编号" MaxLength="20"  LabelWidth="90px">
+                        <f:TextBox ID="txtUserCode" runat="server" Label="编号" MaxLength="20" LabelWidth="90px">
                         </f:TextBox>
                         <f:TextBox ID="txtUserName" runat="server" Label="姓名" Required="true" ShowRedStar="true" MaxLength="20"
                             FocusOnPageLoad="true" LabelWidth="90px">
                         </f:TextBox>
-                          <f:TextBox ID="txtAccount" runat="server" Label="登录账号" Required="true" ShowRedStar="true" MaxLength="50" 
-                              LabelWidth="90px">
+                        <f:TextBox ID="txtAccount" runat="server" Label="登录账号" Required="true" ShowRedStar="true" MaxLength="50"
+                            LabelWidth="90px">
                         </f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                          <f:DropDownList ID="drpUnit" runat="server" Label="单位" EnableEdit="true" ForceSelection="false"
+                        <f:DropDownList ID="drpUnit" runat="server" Label="单位" EnableEdit="true" ForceSelection="false"
                             Required="true" ShowRedStar="true" LabelWidth="90px">
                         </f:DropDownList>
                         <f:TextBox ID="txtIdentityCard" runat="server" Label="身份证号" MaxLength="50" ShowRedStar="true" Required="true"
@@ -37,50 +37,55 @@
                     </Items>
                 </f:FormRow>
                 <f:FormRow runat="server" ID="trServer">
-                    <Items>                      
+                    <Items>
                         <f:DropDownList ID="drpDepart" runat="server" Label="部门" ShowRedStar="true" Required="true"
                             EnableEdit="true" ForceSelection="false" LabelWidth="90px">
                         </f:DropDownList>
-                        <f:DropDownList ID="drpIsOffice" runat="server" Label="本部人员"  
+                        <f:DropDownList ID="drpIsOffice" runat="server" Label="本部人员"
                             EnableEdit="true" ForceSelection="false" LabelWidth="90px">
                         </f:DropDownList>
-                          <f:DropDownList ID="drpRole" runat="server" Label="本部角色" EnableEdit="true" ForceSelection="false" LabelWidth="90px">
+                        <f:DropDownList ID="drpRole" runat="server" Label="本部角色" EnableEdit="true" ForceSelection="false" LabelWidth="90px">
                         </f:DropDownList>
                     </Items>
-                </f:FormRow>                
+                </f:FormRow>
                 <f:FormRow>
                     <Items>
-                          <f:DropDownList ID="drpIsPost" runat="server" Label="在岗" EnableEdit="true" ForceSelection="false"
+                        <f:DropDownList ID="drpIsPost" runat="server" Label="在岗" EnableEdit="true" ForceSelection="false"
                             Required="true" ShowRedStar="true" LabelWidth="90px">
                         </f:DropDownList>
-                         <f:Image ID="Image2" ImageUrl="~/res/images/Signature0.png" runat="server" Height="35px" Width="90px"
-                                BoxFlex="1" Label="签名" LabelWidth="90px">
-                            </f:Image>
-                            <f:FileUpload runat="server" ID="fileSignature" EmptyText="请选择"
-                                OnFileSelected="btnSignature_Click" AutoPostBack="true" Width="150px" LabelWidth="90px">
-                            </f:FileUpload>
+                        <f:Image ID="Image2" ImageUrl="~/res/images/Signature0.png" runat="server" Height="35px" Width="90px"
+                            BoxFlex="1" Label="签名" LabelWidth="90px">
+                        </f:Image>
+                        <f:FileUpload runat="server" ID="fileSignature" EmptyText="请选择"
+                            OnFileSelected="btnSignature_Click" AutoPostBack="true" Width="150px" LabelWidth="90px">
+                        </f:FileUpload>
                     </Items>
-                </f:FormRow>  
+                </f:FormRow>
                 <f:FormRow runat="server">
-                    <Items>                      
-                          <f:DropDownList ID="drpMainCNProfessional" runat="server" Label="主专业" EnableEdit="true" LabelWidth="90px">
+                    <Items>
+                        <f:DropDownList ID="drpMainCNProfessional" runat="server" Label="主专业" EnableEdit="true" LabelWidth="90px">
+                        </f:DropDownList>
+                        <f:DropDownList ID="drpViceCNProfessional" runat="server" Label="副专业" EnableEdit="true"
+                            EnableMultiSelect="true" MaxLength="500" EnableCheckBoxSelect="true">
                         </f:DropDownList>
-                        <f:DropDownList ID="drpViceCNProfessional" runat="server" Label="副专业" EnableEdit="true" 
-                        EnableMultiSelect="true" MaxLength="500" EnableCheckBoxSelect="true">
-                    </f:DropDownList>
                         <f:RadioButtonList runat="server" ID="rblHomePageType" Label="首页加载">
                             <f:RadioItem Text="施工管理" Value="1" Selected="true" />
                             <f:RadioItem Text="QHSE" Value="2" />
                         </f:RadioButtonList>
                     </Items>
-                </f:FormRow>   
+                    </f:FormRow>  
+                <f:FormRow runat="server">
+                    <items>
+                        <f:CheckBox runat="server" Label="是否督查人员" LabelAlign="Right" ID="cbIsInspectionBrigade" />
+                    </items>
+                </f:FormRow>
             </Rows>
             <Toolbars>
                 <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
                     <Items>
-                         <f:Button ID="btnArrowRefresh" Text="重置密码" Icon="ArrowRefresh" ConfirmText="确定恢复当前用户原始密码？" OnClick="btnArrowRefresh_Click"
-                                runat="server" Hidden="true">
-                            </f:Button>  
+                        <f:Button ID="btnArrowRefresh" Text="重置密码" Icon="ArrowRefresh" ConfirmText="确定恢复当前用户原始密码？" OnClick="btnArrowRefresh_Click"
+                            runat="server" Hidden="true">
+                        </f:Button>
                         <f:ToolbarFill runat="server"></f:ToolbarFill>
                         <f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1" Hidden="true"
                             OnClick="btnSave_Click">
@@ -90,7 +95,7 @@
                     </Items>
                 </f:Toolbar>
             </Toolbars>
-        </f:Form>          
+        </f:Form>
         <f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
             Height="500px">
diff --git a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs
index 5a057dc7..b72bbe5c 100644
--- a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs
@@ -137,6 +137,8 @@ namespace FineUIPro.Web.SysManage
                         {
                             this.rblHomePageType.SelectedValue = user.HomePageType;
                         }
+                        cbIsInspectionBrigade.Checked = user.IsInspectionBrigade ?? false;
+
                     }
                 }
 
@@ -237,6 +239,7 @@ namespace FineUIPro.Web.SysManage
                     }
                 }
             }
+            newUser.IsInspectionBrigade = cbIsInspectionBrigade.Checked;
             newUser.HomePageType = this.rblHomePageType.SelectedValue;
             if (string.IsNullOrEmpty(this.UserId))
             {
diff --git a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.designer.cs
index 77296eed..a6469fde 100644
--- a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.SysManage {
-    
-    
-    public partial class UserListEdit {
-        
+namespace FineUIPro.Web.SysManage
+{
+
+
+    public partial class UserListEdit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtUserCode 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtUserCode;
-        
+
         /// <summary>
         /// txtUserName 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtUserName;
-        
+
         /// <summary>
         /// txtAccount 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtAccount;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// txtIdentityCard 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtIdentityCard;
-        
+
         /// <summary>
         /// txtTelephone 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTelephone;
-        
+
         /// <summary>
         /// trServer 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FormRow trServer;
-        
+
         /// <summary>
         /// drpDepart 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpDepart;
-        
+
         /// <summary>
         /// drpIsOffice 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpIsOffice;
-        
+
         /// <summary>
         /// drpRole 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpRole;
-        
+
         /// <summary>
         /// drpIsPost 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpIsPost;
-        
+
         /// <summary>
         /// Image2 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Image Image2;
-        
+
         /// <summary>
         /// fileSignature 控件。
         /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FileUpload fileSignature;
-        
+
         /// <summary>
         /// drpMainCNProfessional 控件。
         /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpMainCNProfessional;
-        
+
         /// <summary>
         /// drpViceCNProfessional 控件。
         /// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpViceCNProfessional;
-        
+
         /// <summary>
         /// rblHomePageType 控件。
         /// </summary>
@@ -182,7 +184,16 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblHomePageType;
-        
+
+        /// <summary>
+        /// cbIsInspectionBrigade 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox cbIsInspectionBrigade;
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// btnArrowRefresh 控件。
         /// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnArrowRefresh;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -218,7 +229,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
diff --git a/SGGL/Model/APIItem/InspectionBrigadeUserItem.cs b/SGGL/Model/APIItem/InspectionBrigadeUserItem.cs
new file mode 100644
index 00000000..36438258
--- /dev/null
+++ b/SGGL/Model/APIItem/InspectionBrigadeUserItem.cs
@@ -0,0 +1,91 @@
+using System;
+
+namespace Model
+{
+    public class InspectionBrigadeUserItem
+    {
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string UserId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 账号
+        /// </summary>
+        public string Account
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 密码
+        /// </summary>
+        public string Password
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 性别
+        /// </summary>
+        public string Sex
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 单位ID
+        /// </summary>
+        public string UnitId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 单位名称
+        /// </summary>
+        public string UnitName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 单位社会统一信用代码
+        /// </summary>
+        public string CollCropCode
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 身份证
+        /// </summary>
+        public string IdentityCard
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 电话
+        /// </summary>
+        public string Telephone
+        {
+            get;
+            set;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index debdf65a..82b864f7 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -1367,9 +1367,6 @@ namespace Model
     partial void InsertJDGL_UndergroundPipeCompletion(JDGL_UndergroundPipeCompletion instance);
     partial void UpdateJDGL_UndergroundPipeCompletion(JDGL_UndergroundPipeCompletion instance);
     partial void DeleteJDGL_UndergroundPipeCompletion(JDGL_UndergroundPipeCompletion instance);
-    partial void InsertJDGL_WBS(JDGL_WBS instance);
-    partial void UpdateJDGL_WBS(JDGL_WBS instance);
-    partial void DeleteJDGL_WBS(JDGL_WBS instance);
     partial void InsertJDGL_WeekPlan(JDGL_WeekPlan instance);
     partial void UpdateJDGL_WeekPlan(JDGL_WeekPlan instance);
     partial void DeleteJDGL_WeekPlan(JDGL_WeekPlan instance);
@@ -6349,14 +6346,6 @@ namespace Model
 			}
 		}
 		
-		public System.Data.Linq.Table<JDGL_WBS> JDGL_WBS
-		{
-			get
-			{
-				return this.GetTable<JDGL_WBS>();
-			}
-		}
-		
 		public System.Data.Linq.Table<JDGL_WeekPlan> JDGL_WeekPlan
 		{
 			get
@@ -96634,7 +96623,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateNumber", DbType="NVarChar(500)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateNumber", DbType="NVarChar(50)")]
 		public string CertificateNumber
 		{
 			get
@@ -219230,333 +219219,6 @@ namespace Model
 		}
 	}
 	
-	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JDGL_WBS")]
-	public partial class JDGL_WBS : INotifyPropertyChanging, INotifyPropertyChanged
-	{
-		
-		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
-		
-		private string _Id;
-		
-		private string _ProjectId;
-		
-		private string _ParentId;
-		
-		private string _ItemName;
-		
-		private string _ItemNum;
-		
-		private System.Nullable<System.DateTime> _PlanStart;
-		
-		private System.Nullable<System.DateTime> _PlanEnd;
-		
-		private System.Nullable<System.DateTime> _RealityEnd;
-		
-		private string _PathCode;
-		
-		private EntityRef<JDGL_WBS> _JDGL_WBS_JDGL_WBS;
-		
-		private EntityRef<JDGL_WBS> _JDGL_WBS_JDGL_WBS1;
-		
-    #region 可扩展性方法定义
-    partial void OnLoaded();
-    partial void OnValidate(System.Data.Linq.ChangeAction action);
-    partial void OnCreated();
-    partial void OnIdChanging(string value);
-    partial void OnIdChanged();
-    partial void OnProjectIdChanging(string value);
-    partial void OnProjectIdChanged();
-    partial void OnParentIdChanging(string value);
-    partial void OnParentIdChanged();
-    partial void OnItemNameChanging(string value);
-    partial void OnItemNameChanged();
-    partial void OnItemNumChanging(string value);
-    partial void OnItemNumChanged();
-    partial void OnPlanStartChanging(System.Nullable<System.DateTime> value);
-    partial void OnPlanStartChanged();
-    partial void OnPlanEndChanging(System.Nullable<System.DateTime> value);
-    partial void OnPlanEndChanged();
-    partial void OnRealityEndChanging(System.Nullable<System.DateTime> value);
-    partial void OnRealityEndChanged();
-    partial void OnPathCodeChanging(string value);
-    partial void OnPathCodeChanged();
-    #endregion
-		
-		public JDGL_WBS()
-		{
-			this._JDGL_WBS_JDGL_WBS = default(EntityRef<JDGL_WBS>);
-			this._JDGL_WBS_JDGL_WBS1 = default(EntityRef<JDGL_WBS>);
-			OnCreated();
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
-		public string Id
-		{
-			get
-			{
-				return this._Id;
-			}
-			set
-			{
-				if ((this._Id != value))
-				{
-					if (this._JDGL_WBS_JDGL_WBS.HasLoadedOrAssignedValue)
-					{
-						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
-					}
-					this.OnIdChanging(value);
-					this.SendPropertyChanging();
-					this._Id = value;
-					this.SendPropertyChanged("Id");
-					this.OnIdChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
-		public string ProjectId
-		{
-			get
-			{
-				return this._ProjectId;
-			}
-			set
-			{
-				if ((this._ProjectId != value))
-				{
-					this.OnProjectIdChanging(value);
-					this.SendPropertyChanging();
-					this._ProjectId = value;
-					this.SendPropertyChanged("ProjectId");
-					this.OnProjectIdChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ParentId", DbType="NVarChar(50)")]
-		public string ParentId
-		{
-			get
-			{
-				return this._ParentId;
-			}
-			set
-			{
-				if ((this._ParentId != value))
-				{
-					this.OnParentIdChanging(value);
-					this.SendPropertyChanging();
-					this._ParentId = value;
-					this.SendPropertyChanged("ParentId");
-					this.OnParentIdChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ItemName", DbType="NVarChar(50)")]
-		public string ItemName
-		{
-			get
-			{
-				return this._ItemName;
-			}
-			set
-			{
-				if ((this._ItemName != value))
-				{
-					this.OnItemNameChanging(value);
-					this.SendPropertyChanging();
-					this._ItemName = value;
-					this.SendPropertyChanged("ItemName");
-					this.OnItemNameChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ItemNum", DbType="NVarChar(50)")]
-		public string ItemNum
-		{
-			get
-			{
-				return this._ItemNum;
-			}
-			set
-			{
-				if ((this._ItemNum != value))
-				{
-					this.OnItemNumChanging(value);
-					this.SendPropertyChanging();
-					this._ItemNum = value;
-					this.SendPropertyChanged("ItemNum");
-					this.OnItemNumChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanStart", DbType="DateTime")]
-		public System.Nullable<System.DateTime> PlanStart
-		{
-			get
-			{
-				return this._PlanStart;
-			}
-			set
-			{
-				if ((this._PlanStart != value))
-				{
-					this.OnPlanStartChanging(value);
-					this.SendPropertyChanging();
-					this._PlanStart = value;
-					this.SendPropertyChanged("PlanStart");
-					this.OnPlanStartChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanEnd", DbType="DateTime")]
-		public System.Nullable<System.DateTime> PlanEnd
-		{
-			get
-			{
-				return this._PlanEnd;
-			}
-			set
-			{
-				if ((this._PlanEnd != value))
-				{
-					this.OnPlanEndChanging(value);
-					this.SendPropertyChanging();
-					this._PlanEnd = value;
-					this.SendPropertyChanged("PlanEnd");
-					this.OnPlanEndChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealityEnd", DbType="DateTime")]
-		public System.Nullable<System.DateTime> RealityEnd
-		{
-			get
-			{
-				return this._RealityEnd;
-			}
-			set
-			{
-				if ((this._RealityEnd != value))
-				{
-					this.OnRealityEndChanging(value);
-					this.SendPropertyChanging();
-					this._RealityEnd = value;
-					this.SendPropertyChanged("RealityEnd");
-					this.OnRealityEndChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PathCode", DbType="NVarChar(50)")]
-		public string PathCode
-		{
-			get
-			{
-				return this._PathCode;
-			}
-			set
-			{
-				if ((this._PathCode != value))
-				{
-					this.OnPathCodeChanging(value);
-					this.SendPropertyChanging();
-					this._PathCode = value;
-					this.SendPropertyChanged("PathCode");
-					this.OnPathCodeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_WBS_JDGL_WBS", Storage="_JDGL_WBS_JDGL_WBS", ThisKey="Id", OtherKey="Id", IsForeignKey=true)]
-		public JDGL_WBS JDGL_WBS_JDGL_WBS
-		{
-			get
-			{
-				return this._JDGL_WBS_JDGL_WBS.Entity;
-			}
-			set
-			{
-				JDGL_WBS previousValue = this._JDGL_WBS_JDGL_WBS.Entity;
-				if (((previousValue != value) 
-							|| (this._JDGL_WBS_JDGL_WBS.HasLoadedOrAssignedValue == false)))
-				{
-					this.SendPropertyChanging();
-					if ((previousValue != null))
-					{
-						this._JDGL_WBS_JDGL_WBS.Entity = null;
-						previousValue.JDGL_WBS_JDGL_WBS1 = null;
-					}
-					this._JDGL_WBS_JDGL_WBS.Entity = value;
-					if ((value != null))
-					{
-						value.JDGL_WBS_JDGL_WBS1 = this;
-						this._Id = value.Id;
-					}
-					else
-					{
-						this._Id = default(string);
-					}
-					this.SendPropertyChanged("JDGL_WBS_JDGL_WBS");
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_WBS_JDGL_WBS", Storage="_JDGL_WBS_JDGL_WBS1", ThisKey="Id", OtherKey="Id", IsUnique=true, IsForeignKey=false, DeleteRule="NO ACTION")]
-		public JDGL_WBS JDGL_WBS_JDGL_WBS1
-		{
-			get
-			{
-				return this._JDGL_WBS_JDGL_WBS1.Entity;
-			}
-			set
-			{
-				JDGL_WBS previousValue = this._JDGL_WBS_JDGL_WBS1.Entity;
-				if (((previousValue != value) 
-							|| (this._JDGL_WBS_JDGL_WBS1.HasLoadedOrAssignedValue == false)))
-				{
-					this.SendPropertyChanging();
-					if ((previousValue != null))
-					{
-						this._JDGL_WBS_JDGL_WBS1.Entity = null;
-						previousValue.JDGL_WBS_JDGL_WBS = null;
-					}
-					this._JDGL_WBS_JDGL_WBS1.Entity = value;
-					if ((value != null))
-					{
-						value.JDGL_WBS_JDGL_WBS = this;
-					}
-					this.SendPropertyChanged("JDGL_WBS_JDGL_WBS1");
-				}
-			}
-		}
-		
-		public event PropertyChangingEventHandler PropertyChanging;
-		
-		public event PropertyChangedEventHandler PropertyChanged;
-		
-		protected virtual void SendPropertyChanging()
-		{
-			if ((this.PropertyChanging != null))
-			{
-				this.PropertyChanging(this, emptyChangingEventArgs);
-			}
-		}
-		
-		protected virtual void SendPropertyChanged(String propertyName)
-		{
-			if ((this.PropertyChanged != null))
-			{
-				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-			}
-		}
-	}
-	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JDGL_WeekPlan")]
 	public partial class JDGL_WeekPlan : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -260763,10 +260425,10 @@ namespace Model
 		
 		private string _MeetingHostManOther;
 		
-		private string _ProjectId;
-		
 		private string _UnitId;
 		
+		private string _ProjectId;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -260801,10 +260463,10 @@ namespace Model
     partial void OnAttentPersonIdsChanged();
     partial void OnMeetingHostManOtherChanging(string value);
     partial void OnMeetingHostManOtherChanged();
-    partial void OnProjectIdChanging(string value);
-    partial void OnProjectIdChanged();
     partial void OnUnitIdChanging(string value);
     partial void OnUnitIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
     #endregion
 		
 		public Meeting_CompanySafetyMeeting()
@@ -261112,26 +260774,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
-		public string ProjectId
-		{
-			get
-			{
-				return this._ProjectId;
-			}
-			set
-			{
-				if ((this._ProjectId != value))
-				{
-					this.OnProjectIdChanging(value);
-					this.SendPropertyChanging();
-					this._ProjectId = value;
-					this.SendPropertyChanged("ProjectId");
-					this.OnProjectIdChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
 		public string UnitId
 		{
@@ -261152,6 +260794,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -280766,7 +280428,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="VarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="VarChar(100)")]
 		public string ProjectName
 		{
 			get
@@ -359785,6 +359447,8 @@ namespace Model
 		
 		private string _CompanyProjectId;
 		
+		private System.Nullable<bool> _IsInspectionBrigade;
+		
 		private EntitySet<Comprehensive_NCRManagement> _Comprehensive_NCRManagement;
 		
 		private EntitySet<Comprehensive_PressurePipe> _Comprehensive_PressurePipe;
@@ -360599,6 +360263,8 @@ namespace Model
     partial void OnHomePageTypeChanged();
     partial void OnCompanyProjectIdChanging(string value);
     partial void OnCompanyProjectIdChanged();
+    partial void OnIsInspectionBrigadeChanging(System.Nullable<bool> value);
+    partial void OnIsInspectionBrigadeChanged();
     #endregion
 		
 		public Sys_User()
@@ -362015,6 +361681,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsInspectionBrigade", DbType="Bit")]
+		public System.Nullable<bool> IsInspectionBrigade
+		{
+			get
+			{
+				return this._IsInspectionBrigade;
+			}
+			set
+			{
+				if ((this._IsInspectionBrigade != value))
+				{
+					this.OnIsInspectionBrigadeChanging(value);
+					this.SendPropertyChanging();
+					this._IsInspectionBrigade = value;
+					this.SendPropertyChanged("IsInspectionBrigade");
+					this.OnIsInspectionBrigadeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_NCRManagement_Sys_User", Storage="_Comprehensive_NCRManagement", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")]
 		public EntitySet<Comprehensive_NCRManagement> Comprehensive_NCRManagement
 		{
diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj
index 3bd8a400..66c80b29 100644
--- a/SGGL/Model/Model.csproj
+++ b/SGGL/Model/Model.csproj
@@ -131,6 +131,7 @@
     <Compile Include="APIItem\HSSE\PictureItem.cs" />
     <Compile Include="APIItem\HSSE\RecityNoticesItem.cs" />
     <Compile Include="APIItem\HSSE\SeDinMonthReport4OtherItem.cs" />
+    <Compile Include="APIItem\InspectionBrigadeUserItem.cs" />
     <Compile Include="APIItem\OperationReportDto.cs" />
     <Compile Include="APIItem\ProjectGpsPointItem.cs" />
     <Compile Include="APIItem\ProjectItem.cs" />