From d696348af58688fb38412c685ea0a86444f64925 Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Tue, 28 Nov 2023 15:50:28 +0800
Subject: [PATCH] 20231128

---
 .../HSSE/EduTrain/TestRecord.aspx.cs          |  2 +-
 .../HSSE/QualityAudit/PersonQualityEdit.aspx  |  4 +-
 .../QualityAudit/PersonQualityEdit.aspx.cs    | 19 +++++--
 .../HSSE/QualityAudit/SafePersonQuality.aspx  |  6 ++
 .../QualityAudit/SafePersonQuality.aspx.cs    | 15 +++++
 .../SafePersonQuality.aspx.designer.cs        | 57 +++++++++++--------
 .../HSSE/SitePerson/PersonList.aspx           |  4 +-
 .../HSSE/SitePerson/PersonListEdit.aspx       |  2 +-
 SGGL/FineUIPro.Web/common/Menu_CQMS.xml       |  2 +-
 SGGL/FineUIPro.Web/common/Menu_HSSE.xml       |  1 +
 10 files changed, 77 insertions(+), 35 deletions(-)

diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs
index 5d6ee39c..e7160e03 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs
@@ -74,7 +74,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
                          + @" LEFT JOIN dbo.Training_TestTraining AS Training ON Training.TrainingId = TestRecord.TestType"
                          + @" LEFT JOIN dbo.SitePerson_Person AS Person ON Person.PersonId = TestRecord.TestManId "
                          + @" LEFT JOIN dbo.Base_Unit AS Unit ON Person.UnitId=Unit.UnitId"
-                         + @" WHERE (isFiled IS NULL OR isFiled = 0) and TestRecord.ProjectId = '" + this.CurrUser.LoginProjectId+"'";
+                         + @" WHERE TestRecord.TestStartTime is not null and  (isFiled IS NULL OR isFiled = 0) and TestRecord.ProjectId = '" + this.CurrUser.LoginProjectId+"'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (!string.IsNullOrEmpty(this.txtName.Text.Trim()))
             {
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx
index 21b83329..e09955d5 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx
@@ -47,14 +47,14 @@
                         LabelWidth="120px">
                     </f:TextBox>
                     <f:TextBox ID="txtSendUnit" runat="server" Label="发证单位" LabelAlign="Right" MaxLength="50"
-                        Required="true" ShowRedStar="true" LabelWidth="120px">
+                         LabelWidth="120px">
                     </f:TextBox>
                 </Items>
             </f:FormRow>
             <f:FormRow>
                 <Items>
                     <f:DatePicker ID="txtSendDate" Label="发证时间" runat="server" LabelAlign="Right" EnableEdit="true"
-                        Required="true" ShowRedStar="true" LabelWidth="120px">
+                          LabelWidth="120px">
                     </f:DatePicker>
                     <f:DatePicker ID="txtLimitDate" Label="有效期至" runat="server" LabelAlign="Right" EnableEdit="true"
                         Required="true" ShowRedStar="true" LabelWidth="120px">
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.cs
index db9a87f3..21b3dfd1 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.cs
@@ -95,8 +95,10 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                         this.drpCertificate.SelectedValue = personQuality.CertificateId;
                         this.txtGrade.Text = personQuality.Grade;
                         this.txtSendUnit.Text = personQuality.SendUnit;
+                        if(personQuality.SendDate.HasValue)
                         this.txtSendDate.Text = string.Format("{0:yyyy-MM-dd}", personQuality.SendDate);
-                        this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", personQuality.LimitDate);
+                        if (personQuality.LimitDate.HasValue)
+                            this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", personQuality.LimitDate);
                         this.txtLateCheckDate.Text = string.Format("{0:yyyy-MM-dd}", personQuality.LateCheckDate);
                         if (!string.IsNullOrEmpty(personQuality.AuditorId))
                         {
@@ -108,8 +110,8 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 }
                 else
                 {
-                    this.txtSendDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
-                    this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                   // this.txtSendDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                   // this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
                     UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_CD, true);
                 }
 
@@ -178,14 +180,21 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                     CertificateName = this.drpCertificate.SelectedItem.Text,
                     Grade = this.txtGrade.Text.Trim(),
                     SendUnit = this.txtSendUnit.Text.Trim(),
-                    SendDate = Funs.GetNewDateTime(this.txtSendDate.Text.Trim()),
-                    LimitDate = Funs.GetNewDateTime(this.txtLimitDate.Text.Trim()),
                     LateCheckDate = Funs.GetNewDateTime(this.txtLateCheckDate.Text.Trim()),             
                     Remark = this.txtRemark.Text.Trim(),
                     CompileMan = this.CurrUser.UserId,
                     CompileDate = DateTime.Now,
                     AuditDate = Funs.GetNewDateTime(this.txtAuditDate.Text.Trim())
                 };
+                if (!string.IsNullOrEmpty(this.txtSendDate.Text.Trim()))
+                {
+                    personQuality.SendDate = Funs.GetNewDateTime(this.txtSendDate.Text.Trim());
+                }
+                if (!string.IsNullOrEmpty(this.txtLimitDate.Text.Trim()))
+                {
+                    personQuality.LimitDate = Funs.GetNewDateTime(this.txtLimitDate.Text.Trim());
+                }
+
                 if (this.drpAuditor.SelectedValue != Const._Null)
                 {
                     personQuality.AuditorId = this.drpAuditor.SelectedValue;
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx
index 0edee522..72eb0b84 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx
@@ -45,6 +45,12 @@
                             <f:TextBox runat="server" Label="岗位" ID="txtWorkPostName" EmptyText="输入查询条件" AutoPostBack="true"
                                 OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px" LabelAlign="right">
                             </f:TextBox>
+                             <f:DropDownList ID="drpIsUsedName" runat="server" Label="状态" EnableEdit="true" AutoPostBack="true"  OnSelectedIndexChanged ="TextBox_TextChanged"
+                                            Width="200px" LabelWidth="70px" LabelAlign="right" ForceSelection="false">
+                                <f:ListItem Value="待审核" Text="待审核" />
+                                <f:ListItem Value="在岗" Text="在岗"  Selected="true"/>
+                                <f:ListItem Value="离岗" Text="离岗" />
+                            </f:DropDownList>
                             <f:ToolbarFill ID="ToolbarFill1" runat="server">
                             </f:ToolbarFill>                                                     
                             <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.cs
index 7ae1d48b..ebeb3799 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.cs
@@ -98,6 +98,21 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 strSql += " AND WorkPost.WorkPostName LIKE @WorkPostName";
                 listStr.Add(new SqlParameter("@WorkPostName", "%" + this.txtWorkPostName.Text.Trim() + "%"));
             }
+            if (drpIsUsedName.SelectedValue == "待审核")
+            {
+                strSql += " AND Person.IsUsed = @IsUsed";
+                listStr.Add(new SqlParameter("@IsUsed", "2"));
+            }
+            else if (drpIsUsedName.SelectedValue == "在岗")
+            {
+                strSql += " AND Person.IsUsed = @IsUsed";
+                listStr.Add(new SqlParameter("@IsUsed", "1"));
+            }
+            else
+            {
+                strSql += " AND Person.IsUsed = @IsUsed";
+                listStr.Add(new SqlParameter("@IsUsed", "0"));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.designer.cs
index 3370ee0e..6033cedc 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.QualityAudit {
-    
-    
-    public partial class SafePersonQuality {
-        
+namespace FineUIPro.Web.HSSE.QualityAudit
+{
+
+
+    public partial class SafePersonQuality
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtCardNo 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCardNo;
-        
+
         /// <summary>
         /// drpUnitId 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitId;
-        
+
         /// <summary>
         /// txtPersonName 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPersonName;
-        
+
         /// <summary>
         /// txtWorkPostName 控件。
         /// </summary>
@@ -92,7 +94,16 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtWorkPostName;
-        
+
+        /// <summary>
+        /// drpIsUsedName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpIsUsedName;
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
index cd8f1e52..5ed9a9a5 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
@@ -132,9 +132,9 @@
                                 FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="入场时间"
                                 HeaderTextAlign="Center" TextAlign="Center">
                             </f:RenderField>
-                                <%--     <f:RenderField HeaderText="电话" ColumnID="Telephone" DataField="Telephone" SortField="Telephone"
+                             <f:RenderField HeaderText="电话" ColumnID="Telephone" DataField="Telephone" SortField="Telephone"
                                  FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="110px">                               
-                            </f:RenderField>--%>
+                            </f:RenderField>
                                 <f:RenderField HeaderText="在场" ColumnID="IsUsedName" DataField="IsUsedName" SortField="IsUsedName"
                                     FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="60px">
                                 </f:RenderField>
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx
index 931e5965..fdbbb389 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx
@@ -91,7 +91,7 @@
                                                 <f:DatePicker ID="txtInTime" runat="server" Label="入场时间" LabelAlign="Right" LabelWidth="110px" ShowRedStar="true" Required="true">
                                                 </f:DatePicker>
                                                 <f:CheckBox runat="server" ID="ckIsSafetyMonitoring" Label="安全监护" LabelAlign="Right"></f:CheckBox>
-                                                <f:TextBox ID="txtTelephone" runat="server" Label="电话" LabelAlign="Right" MaxLength="50">
+                                                <f:TextBox ID="txtTelephone" runat="server" Label="电话"  Required="True" ShowRedStar="True"  LabelAlign="Right" MaxLength="50">
                                                 </f:TextBox>
                                                 <f:RadioButtonList ID="rblIsUsed" runat="server" Label="人员在场" LabelAlign="Right" Required="True" ShowRedStar="True">
                                                     <f:RadioItem Value="1" Text="是" />
diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
index 16810fef..e040c275 100644
--- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="68A54450-557C-4C33-9121-797C15AF1047" Text="开工报告" NavigateUrl="PZHGL/StartWorkReport.aspx">
+  <TreeNode id="68A54450-557C-4C33-9121-797C15AF1047" Text="开复工报告" NavigateUrl="PZHGL/StartWorkReport.aspx">
   </TreeNode>
 <TreeNode id="F8E57293-0BD8-435E-AA08-3B1DC2858CB6" Text="质量策划" NavigateUrl=""><TreeNode id="063601B5-EF75-418B-90E8-4255C0DB06D7" Text="公司/部门质量管理规定" NavigateUrl="CQMS/ZLCH/Zlgltx.aspx"></TreeNode>
 <TreeNode id="AC145EE1-4E5C-4CEF-A85A-AAC331A041DB" Text="质量管理实施计划" NavigateUrl="CQMS/ZLCH/Zlssjh.aspx"></TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
index 59d7c933..7215151c 100644
--- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
@@ -37,6 +37,7 @@
 <TreeNode id="750F5074-45B9-470E-AE1E-6204957421E6" Text="安管人员资质" NavigateUrl="HSSE/QualityAudit/SafePersonQuality.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="467A0CB9-737D-4451-965E-869EBC3A4BD6" Text="HSE检查" NavigateUrl=""><TreeNode id="2FC8AA2A-F421-4174-A05E-2711167AF141" Text="安全巡检" NavigateUrl="HSSE/HiddenInspection/HiddenRectificationList.aspx"></TreeNode>
+<TreeNode id="1B08048F-93ED-4E84-AE65-DB7917EA2DFB" Text="专项检查" NavigateUrl="HSSE/Check/CheckSpecial.aspx"></TreeNode>
 <TreeNode id="C7481FEE-EA92-44B8-99F6-C5CA6BBDCFF5" Text="专项检查记录" NavigateUrl="HSSE/Check/CheckSpecialRecord.aspx"></TreeNode>
 <TreeNode id="C198EBA8-9E23-4654-92E1-09C61105C522" Text="综合检查" NavigateUrl="HSSE/Check/CheckColligation.aspx"></TreeNode>
 <TreeNode id="355265DE-901A-4110-B934-B4DA067C4334" Text="领导带班检查" NavigateUrl="HSSE/Check/ProjectLeaderCheck.aspx"></TreeNode>