质量月报修改

DataBase/版本日志/SGGLDB_WH_2024-04-18-phf.sql

@@ -0,0 +1,2 @@
+update Comprehensive_DesignChangeOrder set ImplementationFrontState='已完成' where ImplementationFrontState like'%完成%';
+update Comprehensive_DesignChangeOrder set ImplementationFrontState='实施中' where ImplementationFrontState !='已完成';

SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx

@@ -42,7 +42,12 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtImplementationFrontState" runat="server" Label="执行情况" MaxLength="50" LabelAlign="right"></f:TextBox>
+                        <%--<f:TextBox ID="txtImplementationFrontState" runat="server" Label="执行情况" MaxLength="50" LabelAlign="right"></f:TextBox>--%>
+                         <f:DropDownList ID="drpImplementationFrontState" runat="server" Label="执行情况" LabelAlign="right">
+                             <f:ListItem  Value="实施中" Text="实施中" Selected="true"/>
+                             <f:ListItem  Value="已完成" Text="已完成"/>
+                         </f:DropDownList>
+
                         <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="施工完成日期" ID="txtCompleteDate" LabelWidth="120px"
                             LabelAlign="right">
                         </f:DatePicker>

SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs

@@ -75,8 +75,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     {
                         this.txtCompleteDate.Text = string.Format("{0:yyyy-MM-dd}", designChangeOrder.CompleteDate);
                     }
-                    this.txtImplementationFrontState.Text = designChangeOrder.ImplementationFrontState;
+                    //this.txtImplementationFrontState.Text = designChangeOrder.ImplementationFrontState;
-
+                    this.drpImplementationFrontState.SelectedValue= designChangeOrder.ImplementationFrontState;
 
 
                     var currApprove = DesignChangeOrderApproveService.GetCurrentApprove(designChangeOrder.DesignChangeOrderId);
@@ -192,7 +192,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             designChangeOrder.IssuedDate = Funs.GetNewDateTime(this.txtIssuedDate.Text);
             designChangeOrder.ApprovalDate = Funs.GetNewDateTime(this.txtApprovalDate.Text);
             designChangeOrder.CompleteDate = Funs.GetNewDateTime(this.txtCompleteDate.Text);
-            designChangeOrder.ImplementationFrontState = this.txtImplementationFrontState.Text.Trim();
+            designChangeOrder.ImplementationFrontState = this.drpImplementationFrontState.SelectedValue;
             if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
             {
                 designChangeOrder.AuditMan = drpAudit.SelectedValue;
@@ -273,7 +273,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             designChangeOrder.IssuedDate = Funs.GetNewDateTime(this.txtIssuedDate.Text);
             designChangeOrder.ApprovalDate = Funs.GetNewDateTime(this.txtApprovalDate.Text);
             designChangeOrder.CompleteDate = Funs.GetNewDateTime(this.txtCompleteDate.Text);
-            designChangeOrder.ImplementationFrontState = this.txtImplementationFrontState.Text.Trim();
+            designChangeOrder.ImplementationFrontState = this.drpImplementationFrontState.SelectedValue;
             if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
             {
                 designChangeOrder.AuditMan = drpAudit.SelectedValue;

SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.designer.cs

@@ -114,13 +114,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         protected global::FineUIPro.DatePicker txtApprovalDate;
 
         /// <summary>
-        /// txtImplementationFrontState 控件。
+        /// drpImplementationFrontState 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtImplementationFrontState;
+        protected global::FineUIPro.DropDownList drpImplementationFrontState;
 
         /// <summary>
         /// txtCompleteDate 控件。

SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs

@@ -684,8 +684,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     checkStatisc.TotalCheckNum = totalManagementList.Count();
                     checkStatisc.OKNum = managementList.Count(x => x.ApprovalDate != null);
                     checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ApprovalDate != null);
-                    checkStatisc.OneOKRate = managementList.Count(x => x.Status == "3").ToString();       //当期完成数
+                    checkStatisc.OneOKRate = managementList.Count(x => x.ImplementationFrontState == "已完成").ToString();       //当期完成数
-                    checkStatisc.TotalOneOKRate = totalManagementList.Count(x => x.Status == "3").ToString();    //累计完成数
+                    checkStatisc.TotalOneOKRate = totalManagementList.Count(x => x.ImplementationFrontState == "已完成").ToString();    //累计完成数
 
                     StatisticsList.Add(checkStatisc);
                     Quantity1Sum += checkStatisc.CheckNum;

SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs

@@ -830,8 +830,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 checkStatisc.TotalCheckNum = totalManagementList.Count();
                 checkStatisc.OKNum = managementList.Count(x => x.ApprovalDate != null);
                 checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ApprovalDate != null);
-                checkStatisc.OneOKRate = managementList.Count(x => x.Status == "3").ToString();       //当期完成数
+                checkStatisc.OneOKRate = managementList.Count(x => x.ImplementationFrontState == "已完成").ToString();       //当期完成数
-                checkStatisc.TotalOneOKRate = totalManagementList.Count(x => x.Status == "3").ToString();    //累计完成数
+                checkStatisc.TotalOneOKRate = totalManagementList.Count(x => x.ImplementationFrontState == "已完成").ToString();    //累计完成数
 
                 StatisticsList.Add(checkStatisc);
                 Quantity1Sum += checkStatisc.CheckNum;