20210708

2021-07-08 20:34:29 +08:00
parent 7f785d6423
commit e092c6cfb0
24 changed files with 5142 additions and 177 deletions
@@ -721,3 +721,28 @@ IP地址:::1

 出错时间:07/06/2021 14:24:26

+
+错误信息开始=====>
+错误类型:JsonReaderException
+错误信息:Unexpected character encountered while parsing value: <. Path '', line 0, position 0.
+错误堆栈:
+   在 Newtonsoft.Json.JsonTextReader.ParseValue()
+   在 Newtonsoft.Json.JsonTextReader.Read()
+   在 Newtonsoft.Json.Linq.JObject.Load(JsonReader reader, JsonLoadSettings settings)
+   在 Newtonsoft.Json.Linq.JObject.Parse(String json, JsonLoadSettings settings)
+   在 Newtonsoft.Json.Linq.JObject.Parse(String json)
+   在 BLL.SynchroSetService.PushProCollCompany(String proCode) 位置 D:\WuHuan\SGGL\SGGL\BLL\ZHGL\RealName\SynchroSetService.cs:行号 750
+   在 FineUIPro.Web.ZHGL.RealName.SynchroSet.btnProCollCompany_Click(Object sender, EventArgs e) 位置 D:\WuHuan\SGGL\SGGL\FineUIPro.Web\ZHGL\RealName\SynchroSet.aspx.cs:行号 131
+   在 FineUIPro.Button.OnClick(EventArgs e)
+   在 (Button , EventArgs )
+   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:07/08/2021 20:22:22
+出错文件:http://localhost:8118/ZHGL/RealName/SynchroSet.aspx
+IP地址:::1
+操作人员:系统管理员
+
+出错时间:07/08/2021 20:22:22
+
@@ -91,6 +91,8 @@
                                        </f:Button>
                                        <f:Button ID="btnQR" ToolTip="批量生成二维码" Icon="TableRefresh" runat="server" OnClick="btnQR_Click">
                                        </f:Button>
+                                          <f:Button ID="btnPhoto" ToolTip="刷新照片转二进制" Icon="ArrowRefresh" runat="server" OnClick="btnPhoto_Click" >
+                                        </f:Button>
                                    </Items>
                                </f:Toolbar>
                            </Toolbars>
@@ -722,5 +722,23 @@ namespace FineUIPro.Web.HSSE.SitePerson
            }
            ShowNotify("操作完成，新生成二维码"+ num.ToString()+"条", MessageBoxIcon.Success);
        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnPhoto_Click(object sender, EventArgs e)
+        {
+            var getPersons = from x in Funs.DB.SitePerson_Person
+                             where x.ProjectId == this.ProjectId && x.HeadImage == null && x.PhotoUrl != null
+                             select x;
+            foreach (var item in getPersons)
+            {
+                item.HeadImage = AttachFileService.SetImageToByteArray(Funs.RootPath + item.PhotoUrl);
+                Funs.DB.SubmitChanges();
+            }
+        }
    }
 }
@@ -237,6 +237,15 @@ namespace FineUIPro.Web.HSSE.SitePerson {
        /// </remarks>
        protected global::FineUIPro.Button btnQR;
        
+        /// <summary>
+        /// btnPhoto 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnPhoto;
+        
        /// <summary>
        /// lbI 控件。
        /// </summary>
@@ -92,21 +92,21 @@ namespace FineUIPro.Web.HSSE.SitePerson
                    if (person != null)
                    {
                        this.ProjectId = person.ProjectId;
-                        if (this.ProjectId != this.CurrUser.LoginProjectId)
+                        if (this.ProjectId != this.CurrUser.LoginProjectId || this.UnitId != person.UnitId)
                        {
-                            this.InitDropDownList();
+                            this.UnitId = person.UnitId;
+                            this.InitProjectDropDownList();
                        }
                        if (!string.IsNullOrEmpty(person.Sex))
                        {
                            this.rblSex.SelectedValue = person.Sex;
                        }
                        if (!string.IsNullOrEmpty(person.UnitId))
-                        {
+                        {                              
                            var unit = BLL.UnitService.GetUnitByUnitId(person.UnitId);
                            if (unit != null)
                            {
-                                this.txtUnitName.Text = unit.UnitName;
-                                this.UnitId = person.UnitId;
+                                this.txtUnitName.Text = unit.UnitName;                            
                            }
                        }
                        if (!string.IsNullOrEmpty(person.WorkAreaId))
@@ -257,15 +257,11 @@ namespace FineUIPro.Web.HSSE.SitePerson
        /// 初始化下拉框
        /// </summary>
        private void InitDropDownList()
-        {
-            gvWorkArea.DataSource = BLL.UnitWorkService.GetUnitWorkLists(this.CurrUser.LoginProjectId);
-            gvWorkArea.DataBind();//单位工程 
+        {     
            WorkPostService.InitWorkPostDropDownList(this.drpPost, true);
            PositionService.InitPositionDropDownList(this.drpPosition, true);
-            PostTitleService.InitPostTitleDropDownList(this.drpTitle, true);
-            TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroup, this.ProjectId, this.UnitId, true);
-            CertificateService.InitCertificateDropDownList(this.drpCertificate, true);
-            UserService.InitFlowOperateControlUserDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_CWCEC, true);
+            PostTitleService.InitPostTitleDropDownList(this.drpTitle, true);           
+            CertificateService.InitCertificateDropDownList(this.drpCertificate, true);            
            CNProfessionalService.InitCNProfessionalDownList(this.drpMainCNProfessional, true);
            CNProfessionalService.InitCNProfessionalDownList(this.drpViceCNProfessional, true);
            BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpEduLevel, "EDU_LEVEL", true);
@@ -277,6 +273,17 @@ namespace FineUIPro.Web.HSSE.SitePerson
            Funs.FineUIPleaseSelect(this.drpProvinceCode);
        }

+        private void InitProjectDropDownList()
+        {
+            gvWorkArea.DataSource = BLL.UnitWorkService.GetUnitWorkLists(this.ProjectId);
+            gvWorkArea.DataBind();//单位工程 
+
+            this.drpTeamGroup.Items.Clear();
+            TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroup, this.ProjectId, this.UnitId, true);
+
+            UserService.InitFlowOperateControlUserDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_CWCEC, true);
+        }
+
        #region 保存
        /// <summary>
        /// 保存按钮
@@ -119,7 +119,7 @@
    </f:Panel> 
    <f:Window ID="Window1" Title="项目" Hidden="true" EnableIFrame="true" EnableMaximize="true"
        Target="Parent" EnableResize="false" runat="server" IsModal="true" 
-        Width="900px" Height="500px">
+        Width="900px" Height="600px">
    </f:Window>       
    <f:Menu ID="Menu1" runat="server">
          <f:MenuButton ID="btnEnter" EnablePostBack="true" runat="server"  Icon="Outline" Text="进入项目"
@@ -77,13 +77,18 @@
                <Items>
                   <f:DropDownList ID="drpDriveManager" runat="server" Label="开车经理" EnableEdit="true">
                    </f:DropDownList>     
-                   <f:TextBox ID="txtProjectAddress" runat="server" Label="项目地址" LabelWidth="150px" MaxLength="500" ></f:TextBox>
+                   <f:DropDownList ID="drpUnit" Label="所属单位" runat="server" EnableEdit="true">
+                   </f:DropDownList>
                </Items>
            </f:FormRow>  
+            <f:FormRow>
+                <Items>
+                    <f:TextBox ID="txtProjectAddress" runat="server" Label="项目地址" LabelWidth="150px" MaxLength="500" ></f:TextBox>
+                </Items>
+            </f:FormRow>
            <f:FormRow>
                 <Items>
-                   <f:DropDownList ID="drpUnit" Label="所属单位" runat="server" EnableEdit="true">
-                   </f:DropDownList>
+                     <f:TextBox ID="txtJTProjectCode" runat="server" Label="集团项目号"  MaxLength="50" LabelWidth="150px"></f:TextBox>
                     <f:CheckBox runat="server" ID="ckbIsForeign" Label="海外项目" LabelWidth="150px"></f:CheckBox>                     
                </Items>
            </f:FormRow> 
@@ -63,6 +63,7 @@ namespace FineUIPro.Web.ProjectData
                    if (project != null)
                    {
                        this.txtProjectCode.Text = project.ProjectCode;
+                        this.txtJTProjectCode.Text = project.JTProjectCode;
                        this.txtProjectName.Text = project.ProjectName;
                        this.txtProjectAddress.Text = project.ProjectAddress;
                        this.txtWorkRange.Text = project.WorkRange;
@@ -184,6 +185,7 @@ namespace FineUIPro.Web.ProjectData
            Base_Project project = new Base_Project
            {
                ProjectCode = this.txtProjectCode.Text.Trim(),
+                JTProjectCode = this.txtJTProjectCode.Text.Trim(),
                ProjectName = Regex.Replace(this.txtProjectName.Text, @"\s", ""),
                ProjectAddress = this.txtProjectAddress.Text.Trim(),
                WorkRange = this.txtWorkRange.Text.Trim(),
@@ -200,7 +202,10 @@ namespace FineUIPro.Web.ProjectData
                EnglishRemark = this.txtEnglishRemark.Text.Trim(),
                Progress = Funs.GetNewDecimal(this.txtProgress.Text),
            };
-
+            if (string.IsNullOrEmpty(project.JTProjectCode))
+            {
+                project.JTProjectCode = project.ProjectCode;
+            }
            //Country = this.txtCountry.Text.Trim(),
            /// Province = this.drpProvince.SelectedValue,
            if (this.drpCountry.SelectedValue != Const._Null)
@@ -174,6 +174,15 @@ namespace FineUIPro.Web.ProjectData {
        /// </remarks>
        protected global::FineUIPro.DropDownList drpDriveManager;
        
+        /// <summary>
+        /// drpUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnit;
+        
        /// <summary>
        /// txtProjectAddress 控件。
        /// </summary>
@@ -184,13 +193,13 @@ namespace FineUIPro.Web.ProjectData {
        protected global::FineUIPro.TextBox txtProjectAddress;
        
        /// <summary>
-        /// drpUnit 控件。
+        /// txtJTProjectCode 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.DropDownList drpUnit;
+        protected global::FineUIPro.TextBox txtJTProjectCode;
        
        /// <summary>
        /// ckbIsForeign 控件。
@@ -20,45 +20,50 @@
            <f:FormRow>
                <Items>
                   <f:TextBox ID="txtProjectCode" runat="server" Label="项目号" Readonly="true" LabelWidth="150px"></f:TextBox>
-                   <f:TextBox ID="txtShortName" runat="server" Label="简称" Readonly="true" LabelWidth="140px"></f:TextBox>
+                   <f:TextBox ID="txtShortName" runat="server" Label="简称" Readonly="true" LabelWidth="150px"></f:TextBox>
                </Items>
            </f:FormRow>
            <f:FormRow ColumnWidths="50% 25% 25%">
                 <Items>               
                  <f:TextBox ID="txtProjectType" runat="server" Label="项目类型" Readonly="true" LabelWidth="150px"></f:TextBox>               
-                   <f:TextBox ID="txtProjectState" runat="server" Label="项目状态" Readonly="true" LabelWidth="140px"></f:TextBox>
-                     <f:TextBox ID="txtProjectState2" runat="server" Label="细分状态" Readonly="true" LabelWidth="140px"></f:TextBox>
+                   <f:TextBox ID="txtProjectState" runat="server" Label="项目状态" Readonly="true" LabelWidth="150px"></f:TextBox>
+                     <f:TextBox ID="txtProjectState2" runat="server" Label="细分状态" Readonly="true" LabelWidth="150px"></f:TextBox>
               </Items>                                         
            </f:FormRow> 
            <f:FormRow>
                <Items>
                    <f:TextBox runat="server" Label="开工日期" ID="txtStartDate"  Readonly="true" LabelWidth="150px"></f:TextBox>           
-                   <f:TextBox runat="server" Label="竣工日期" ID="txtEndDate" Readonly="true" LabelWidth="140px"></f:TextBox>
+                   <f:TextBox runat="server" Label="竣工日期" ID="txtEndDate" Readonly="true" LabelWidth="150px"></f:TextBox>
                </Items>
            </f:FormRow> 
             <f:FormRow>              
               <Items>
                      <f:TextBox runat="server" ID="txtDuration" Label="项目建设工期(月)" LabelWidth="150px"  Readonly="true">
                    </f:TextBox>
-                   <f:TextBox ID="txtProjectManager" runat="server" Label="项目经理" Readonly="true" LabelWidth="140px"></f:TextBox>                      
+                   <f:TextBox ID="txtProjectManager" runat="server" Label="项目经理" Readonly="true" LabelWidth="150px"></f:TextBox>                      
                </Items>
            </f:FormRow>  
            <f:FormRow>
                <Items>               
                    <f:TextBox ID="txtConstructionManager" runat="server" Label="施工经理" Readonly="true" LabelWidth="150px"></f:TextBox> 
-                    <f:TextBox ID="txtHSSEManager" runat="server" Label="安全经理" Readonly="true" LabelWidth="140px"></f:TextBox>      
+                    <f:TextBox ID="txtHSSEManager" runat="server" Label="安全经理" Readonly="true" LabelWidth="150px"></f:TextBox>      
                </Items>
            </f:FormRow>  
            <f:FormRow>
                <Items>               
                    <f:TextBox ID="txtQAManager" runat="server" Label="质量经理" Readonly="true" LabelWidth="150px"></f:TextBox> 
-                    <f:TextBox ID="txtDriveManager" runat="server" Label="开车经理" Readonly="true" LabelWidth="140px"></f:TextBox>      
+                    <f:TextBox ID="txtDriveManager" runat="server" Label="开车经理" Readonly="true" LabelWidth="150px"></f:TextBox>      
+                </Items>
+            </f:FormRow>
+             <f:FormRow>
+                <Items>  
+                    <f:TextBox ID="txtProjectAddress" runat="server" Label="项目地址" Readonly="true" LabelWidth="150px"></f:TextBox>
                </Items>
            </f:FormRow>
            <f:FormRow>
                 <Items>
-                   <f:TextBox ID="txtProjectAddress" runat="server" Label="项目地址" Readonly="true" LabelWidth="150px"></f:TextBox>
-                   <f:TextBox ID="txtUnitName" runat="server" Label="所属单位" Readonly="true" LabelWidth="140px"></f:TextBox>
+                      <f:TextBox ID="txtJTProjectCode" runat="server" Label="集团项目号"  Readonly="true" LabelWidth="150px"></f:TextBox>
+                   <f:TextBox ID="txtUnitName" runat="server" Label="所属单位" Readonly="true" LabelWidth="150px"></f:TextBox>
                </Items>
            </f:FormRow> 
                <f:FormRow>
@@ -74,19 +79,19 @@
            <f:FormRow>
                 <Items>                   
                    <f:TextBox runat="server" ID="txtProjectMoney" Label="合同额(万元)" Readonly="true" LabelWidth="150px"></f:TextBox>
-                     <f:TextBox runat="server" ID="txtConstructionMoney" Label="施工合同额(万元)" LabelWidth="140px" Readonly="true"></f:TextBox>
+                     <f:TextBox runat="server" ID="txtConstructionMoney" Label="施工合同额(万元)" LabelWidth="150px" Readonly="true"></f:TextBox>
                </Items>
            </f:FormRow> 
            <f:FormRow>
                 <Items>                   
                    <f:TextBox runat="server" ID="txtTelephone" Label="项目部电话" Readonly="true" LabelWidth="150px"></f:TextBox>
-                     <f:TextBox runat="server" ID="txtCountry" Label="国家" LabelWidth="140px" Readonly="true"></f:TextBox>
+                     <f:TextBox runat="server" ID="txtCountry" Label="国家" LabelWidth="150px" Readonly="true"></f:TextBox>
                </Items>
            </f:FormRow> 
            <f:FormRow>
                 <Items>                   
                    <f:TextBox runat="server" ID="txtProvince" Label="省份" Readonly="true" LabelWidth="150px"></f:TextBox>
-                     <f:TextBox runat="server" ID="txtCity" Label="城市" LabelWidth="140px" Readonly="true"></f:TextBox>
+                     <f:TextBox runat="server" ID="txtCity" Label="城市" LabelWidth="150px" Readonly="true"></f:TextBox>
                </Items>
            </f:FormRow> 
            <f:FormRow>
@@ -43,6 +43,7 @@ namespace FineUIPro.Web.ProjectData
                    if (project != null)
                    {
                        this.txtProjectCode.Text = project.ProjectCode;
+                        this.txtJTProjectCode.Text = project.JTProjectCode;
                        this.txtProjectName.Text = project.ProjectName;
                        this.txtProjectAddress.Text = project.ProjectAddress;
                        this.txtRemark.Text = project.Remark;
@@ -174,6 +174,15 @@ namespace FineUIPro.Web.ProjectData {
        /// </remarks>
        protected global::FineUIPro.TextBox txtProjectAddress;
        
+        /// <summary>
+        /// txtJTProjectCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtJTProjectCode;
+        
        /// <summary>
        /// txtUnitName 控件。
        /// </summary>
@@ -29,7 +29,7 @@ namespace FineUIPro.Web.ZHGL.RealName
                    var getproject = ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
                    if (getproject != null)
                    {
-                        this.drpProject.SelectedValue = getproject.ProjectCode;
+                        this.drpProject.SelectedValue = getproject.JTProjectCode;
                        this.drpProject.Readonly = true;
                    }
                }
@@ -190,7 +190,28 @@ namespace FineUIPro.Web.ZHGL.RealName
        /// <param name="e"></param>
        protected void btnDatabaseGo4_Click(object sender, EventArgs e)
        {
-            ShowNotify(BLL.SynchroSetService.getProject(), MessageBoxIcon.Information);
+            List<string> getCodeList = new List<string>();
+            if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                var getProject = ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
+                if (getProject != null)
+                {
+                    getCodeList.Add(getProject.JTProjectCode);
+                }
+            }
+            else
+            {
+                getCodeList = Funs.DB.RealName_SynchroSet.Select(x => x.ProCode).ToList();
+            }
+            if (getCodeList != null && getCodeList.Count() > 0)
+            {
+                string info = string.Empty;
+                foreach (var item in getCodeList)
+                {
+                    info += "项目[" + item + "]" + SynchroSetService.getProject(item);
+                }
+                ShowNotify(info, MessageBoxIcon.Information);
+            }
            this.BindGrid4();
        }

@@ -41,7 +41,7 @@ namespace FineUIPro.Web.ZHGL.RealName
            List<SqlParameter> listStr = new List<SqlParameter>();
            if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
            {
-                string pcode= ProjectService.GetProjectCodeByProjectId(this.CurrUser.LoginProjectId);
+                string pcode= ProjectService.GetJTProjectCodeByProjectId(this.CurrUser.LoginProjectId);
                strSql += " AND ProjectCode = @ProjectCode";
                listStr.Add(new SqlParameter("@ProjectCode", pcode));
            }
@@ -45,7 +45,7 @@
                    <Items>
                         <f:TextArea ID="txtIdentityCard" runat="server" Label="身份证号码" LabelWidth="120px" >
                        </f:TextArea> 
-                          <f:Button ID="btnPushData" Icon="Accept" runat="server" Text="提交" ToolTip="多身份证用逗号（,）隔开"  OnClick="btnPushData_Click">
+                          <f:Button ID="btnPushData" Icon="Accept" runat="server" Text="提交" ToolTip="多身份证用逗号（,）隔开；或直接复制日志中错误提示信息。"  OnClick="btnPushData_Click">
                        </f:Button>
                    </Items>
                    </f:FormRow>
@@ -1,5 +1,6 @@
 using BLL;
 using System;
+using System.Collections.Generic;
 using System.Configuration;
 using System.Linq;

@@ -45,11 +46,7 @@ namespace FineUIPro.Web.ZHGL.RealName
                Password =  this.txtword.Text.Trim(),
                Intervaltime=Funs.GetNewInt(this.txtintervaltime.Text.Trim()),
            };
-            var getProject = ProjectService.GetProjectByProjectId(this.drpProject.SelectedValue);
-            if (getProject != null)
-            {
-                newSynchroSet.ProCode = getProject.ProjectCode;
-            }
+            newSynchroSet.ProCode = ProjectService.GetJTProjectCodeByProjectId(this.drpProject.SelectedValue);
            BLL.SynchroSetService.SaveSynchroSet(newSynchroSet);
            ShowNotify("保存成功!", MessageBoxIcon.Success);
        }
@@ -70,12 +67,7 @@ namespace FineUIPro.Web.ZHGL.RealName
                Password = this.txtword.Text.Trim(),
                Intervaltime = Funs.GetNewInt(this.txtintervaltime.Text.Trim()),
            };
-            var getProject = ProjectService.GetProjectByProjectId(this.drpProject.SelectedValue);
-            if (getProject != null)
-            {
-                newSynchroSet.ProCode = getProject.ProjectCode;
-            }
-   
+            newSynchroSet.ProCode = ProjectService.GetJTProjectCodeByProjectId(this.drpProject.SelectedValue);
            if (!string.IsNullOrEmpty(SynchroSetService.SaveToken(newSynchroSet)))
            {
                ShowNotify("连接成功！", MessageBoxIcon.Success);
@@ -132,7 +124,7 @@ namespace FineUIPro.Web.ZHGL.RealName
        protected void btnProCollCompany_Click(object sender, EventArgs e)
        {
            string message = string.Empty;
-            string proCode =BLL.ProjectService.GetProjectCodeByProjectId(this.drpProject.SelectedValue);
+            string proCode =BLL.ProjectService.GetJTProjectCodeByProjectId(this.drpProject.SelectedValue);
            var getRProjects = Funs.DB.RealName_Project.FirstOrDefault(x => x.ProCode == proCode);
            if (getRProjects != null)
            {
@@ -153,7 +145,7 @@ namespace FineUIPro.Web.ZHGL.RealName
        protected void btnCollTeam_Click(object sender, EventArgs e)
        {
            string message = string.Empty;
-            string proCode = BLL.ProjectService.GetProjectCodeByProjectId(this.drpProject.SelectedValue);
+            string proCode = BLL.ProjectService.GetJTProjectCodeByProjectId(this.drpProject.SelectedValue);
            var getRProjects = Funs.DB.RealName_Project.FirstOrDefault(x => x.ProCode == proCode);
            if (getRProjects != null)
            {
@@ -177,7 +169,7 @@ namespace FineUIPro.Web.ZHGL.RealName
            //string update ="更新"+ BLL.SynchroSetService.PushPersons(Const.BtnModify,null) ?? "";
            //ShowNotify(add+"|"+ update, MessageBoxIcon.Information);
            string message = string.Empty;
-            string proCode = BLL.ProjectService.GetProjectCodeByProjectId(this.drpProject.SelectedValue);
+            string proCode = BLL.ProjectService.GetJTProjectCodeByProjectId(this.drpProject.SelectedValue);
            var getRProjects = Funs.DB.RealName_Project.FirstOrDefault(x => x.ProCode == proCode);
            if (getRProjects != null)
            {
@@ -199,7 +191,7 @@ namespace FineUIPro.Web.ZHGL.RealName
        protected void btnAttendance_Click(object sender, EventArgs e)
        {
            string message = string.Empty;
-            string proCode = BLL.ProjectService.GetProjectCodeByProjectId(this.drpProject.SelectedValue);
+            string proCode = BLL.ProjectService.GetJTProjectCodeByProjectId(this.drpProject.SelectedValue);
            var getRProjects = Funs.DB.RealName_Project.FirstOrDefault(x => x.ProCode == proCode);
            if (getRProjects != null)
            {
@@ -233,10 +225,10 @@ namespace FineUIPro.Web.ZHGL.RealName
            this.txtapiUrl.Text = Funs.RealNameApiUrl;
            this.txtintervaltime.Text = ConfigurationManager.AppSettings["Intervaltime"];

-            string proCode = BLL.ProjectService.GetProjectCodeByProjectId(this.drpProject.SelectedValue);
-            if (!string.IsNullOrEmpty(proCode))
+            var getpro = Funs.DB.Base_Project.FirstOrDefault(x=>x.ProjectId == this.drpProject.SelectedValue);
+            if (getpro !=null && !string.IsNullOrEmpty(getpro.JTProjectCode))
            {
-                var getSynchroSet = SynchroSetService.GetSynchroSetByUnitId(Const.UnitId_CWCEC, proCode);
+                var getSynchroSet = SynchroSetService.GetSynchroSetByUnitId(Const.UnitId_CWCEC, getpro.JTProjectCode);
                if (getSynchroSet != null)
                {
                    this.txtapiUrl.Text = Funs.RealNameApiUrl;
@@ -256,15 +248,40 @@ namespace FineUIPro.Web.ZHGL.RealName
        protected void btnPushData_Click(object sender, EventArgs e)
        {
            string message = string.Empty;
-            if (!string.IsNullOrEmpty(this.txtIdentityCard.Text.Trim()))
+            string idText = this.txtIdentityCard.Text.Trim();
+            if (!string.IsNullOrEmpty(idText))
            {
-                string proCode = BLL.ProjectService.GetProjectCodeByProjectId(this.drpProject.SelectedValue);
+                string proCode = ProjectService.GetJTProjectCodeByProjectId(this.drpProject.SelectedValue);
                var getRProjects = Funs.DB.RealName_Project.FirstOrDefault(x => x.ProCode == proCode);
                if (getRProjects != null && !string.IsNullOrEmpty(getRProjects.ProCode))
                {
-                    string idc = this.txtIdentityCard.Text.Trim().Replace('，', ',');
-                    var getList = Funs.GetStrListByStr(idc, ',');
-                    if (getList.Count > 0)
+                    idText = idText.Replace("，",",").Replace("(条)","").Replace("；",";").Replace("（","(").Replace("）",")");
+                    List<string> getList = new List<string>();
+                    if (idText.Contains("("))
+                    {
+                        var getData = Funs.GetStrListByStr(idText, ';');
+                        foreach (var itemD in getData)
+                        {
+                            if (!string.IsNullOrEmpty(itemD))
+                            {
+                                var a = itemD.Split('(');
+                                if (a.Count() > 1)
+                                {
+                                    var b = a[1].Split(')');
+                                    if (b.Count() > 1)
+                                    {
+                                        getList.Add(b[0]);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        getList = Funs.GetStrListByStr(idText, ',');
+                    }
+
+                    if (getList != null && getList.Count > 0)
                    {
                        foreach (var item in getList)
                        {