diff --git a/FCL/BLL/BaseInfo/ContractorService.cs b/FCL/BLL/BaseInfo/ContractorService.cs
index ddaa570..cd24103 100644
--- a/FCL/BLL/BaseInfo/ContractorService.cs
+++ b/FCL/BLL/BaseInfo/ContractorService.cs
@@ -38,6 +38,7 @@ namespace BLL
             newContractor.VendorNumber = contractor.VendorNumber;
             newContractor.Contractor = contractor.Contractor;
             newContractor.ContractorCN = contractor.ContractorCN;
+            newContractor.ContractorShortName = contractor.ContractorShortName;
             Funs.DB.Base_Contractor.InsertOnSubmit(newContractor);
             Funs.DB.SubmitChanges();
         }
@@ -54,6 +55,7 @@ namespace BLL
                 newContractor.VendorNumber = contractor.VendorNumber;
                 newContractor.Contractor = contractor.Contractor;
                 newContractor.ContractorCN = contractor.ContractorCN;
+                newContractor.ContractorShortName = contractor.ContractorShortName;
                 Funs.DB.SubmitChanges();
             }
         }
diff --git a/FCL/FineUIPro.Web/BaseInfo/ContractorList.aspx b/FCL/FineUIPro.Web/BaseInfo/ContractorList.aspx
index e859706..d7af252 100644
--- a/FCL/FineUIPro.Web/BaseInfo/ContractorList.aspx
+++ b/FCL/FineUIPro.Web/BaseInfo/ContractorList.aspx
@@ -36,9 +36,12 @@
                                 <f:RenderField Width="120px" ColumnID="VendorNumber" DataField="VendorNumber"
                                     FieldType="String" HeaderText="Vendor Number" HeaderTextAlign="Center" TextAlign="Left">
                                 </f:RenderField>
-                                <f:RenderField Width="720px" ColumnID="Contractor" DataField="Contractor"
+                                <f:RenderField Width="580px" ColumnID="Contractor" DataField="Contractor"
                                     FieldType="String" HeaderText="Contractor" HeaderTextAlign="Center" TextAlign="Left">
                                 </f:RenderField>
+                                <f:RenderField Width="160px" ColumnID="ContractorShortName" DataField="ContractorShortName"
+                                    FieldType="String" HeaderText="承包商简称" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
                             </Columns>
                             <Listeners>
                                 <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@@ -76,6 +79,8 @@
                                 </f:TextBox>
                                 <f:TextBox ID="txtContractorCN" Label="承包商" runat="server" LabelAlign="right" MaxLength="200" LabelWidth="130px">
                                 </f:TextBox>
+                                <f:TextBox ID="txtContractorShortName" Label="承包商简称" runat="server" LabelAlign="right" MaxLength="50" LabelWidth="130px">
+                                </f:TextBox>
                             </Items>
                             <Toolbars>
                                 <f:Toolbar ID="Toolbar1" Position="Top" runat="server">
diff --git a/FCL/FineUIPro.Web/BaseInfo/ContractorList.aspx.cs b/FCL/FineUIPro.Web/BaseInfo/ContractorList.aspx.cs
index 3173212..584931a 100644
--- a/FCL/FineUIPro.Web/BaseInfo/ContractorList.aspx.cs
+++ b/FCL/FineUIPro.Web/BaseInfo/ContractorList.aspx.cs
@@ -42,7 +42,8 @@ namespace FineUIPro.Web.BaseInfo
                                      contractor.VendorNumber, 
                                      (CASE WHEN contractor.Contractor IS NULL THEN ISNULL(contractor.ContractorCN,'')
 											ELSE (CASE WHEN contractor.ContractorCN IS NULL THEN ISNULL(contractor.Contractor,'')
-										ELSE (ISNULL(contractor.Contractor,'') + ISNULL(contractor.ContractorCN,'')) END) END)AS Contractor
+										ELSE (ISNULL(contractor.Contractor,'') + ISNULL(contractor.ContractorCN,'')) END) END)AS Contractor,
+                                        contractor.ContractorShortName
                                FROM Base_Contractor AS contractor WHERE 1=1 ";
 
             List<SqlParameter> listStr = new List<SqlParameter>();
@@ -168,6 +169,7 @@ namespace FineUIPro.Web.BaseInfo
                 this.txtVendorNumber.Text = contractor.VendorNumber;
                 this.txtContractor.Text = contractor.Contractor;
                 this.txtContractorCN.Text = contractor.ContractorCN;
+                this.txtContractorShortName.Text = contractor.ContractorShortName;
                 hfFormID.Text = Id;
                 this.btnDelete.Enabled = true;
             }
@@ -187,6 +189,7 @@ namespace FineUIPro.Web.BaseInfo
             contractor.VendorNumber = this.txtVendorNumber.Text.Trim();
             contractor.Contractor = this.txtContractor.Text.Trim();
             contractor.ContractorCN = this.txtContractorCN.Text.Trim();
+            contractor.ContractorShortName = this.txtContractorShortName.Text.Trim();
 
             if (BLL.ContractorService.IsExitContractor(this.txtContractor.Text.Trim(), strRowID))
             {
@@ -259,6 +262,7 @@ namespace FineUIPro.Web.BaseInfo
             this.txtVendorNumber.Text = string.Empty;
             this.txtContractor.Text = string.Empty;
             this.txtContractorCN.Text = string.Empty;
+            this.txtContractorShortName.Text = string.Empty;
             this.btnDelete.Enabled = false;
         }
 
@@ -333,6 +337,8 @@ namespace FineUIPro.Web.BaseInfo
                     ws.GetRow(rowIndex).GetCell(1).CellStyle = fontStyle;
                     if (ws.GetRow(rowIndex).GetCell(2) == null) ws.GetRow(rowIndex).CreateCell(2);
                     ws.GetRow(rowIndex).GetCell(2).SetCellValue(Grid1.Rows[i].Values[2].ToString());
+                    if (ws.GetRow(rowIndex).GetCell(3) == null) ws.GetRow(rowIndex).CreateCell(3);
+                    ws.GetRow(rowIndex).GetCell(3).SetCellValue(Grid1.Rows[i].Values[3].ToString());
                     rowIndex++;
                 }
                 #endregion
diff --git a/FCL/FineUIPro.Web/BaseInfo/ContractorList.aspx.designer.cs b/FCL/FineUIPro.Web/BaseInfo/ContractorList.aspx.designer.cs
index dd002fb..f874344 100644
--- a/FCL/FineUIPro.Web/BaseInfo/ContractorList.aspx.designer.cs
+++ b/FCL/FineUIPro.Web/BaseInfo/ContractorList.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.BaseInfo {
-    
-    
-    public partial class ContractorList {
-        
+namespace FineUIPro.Web.BaseInfo
+{
+
+
+    public partial class ContractorList
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Panel2 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel2;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtContractorCode 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtContractorCode;
-        
+
         /// <summary>
         /// txtVendorNum 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtVendorNum;
-        
+
         /// <summary>
         /// btnSelect 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSelect;
-        
+
         /// <summary>
         /// btnExport 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnExport;
-        
+
         /// <summary>
         /// ToolbarFill2 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill2;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Panel4 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel4;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.SimpleForm SimpleForm1;
-        
+
         /// <summary>
         /// hfFormID 控件。
         /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hfFormID;
-        
+
         /// <summary>
         /// hfContractDetaliId 控件。
         /// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hfContractDetaliId;
-        
+
         /// <summary>
         /// txtVendorNumber 控件。
         /// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtVendorNumber;
-        
+
         /// <summary>
         /// txtContractor 控件。
         /// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtContractor;
-        
+
         /// <summary>
         /// txtContractorCN 控件。
         /// </summary>
@@ -200,7 +202,16 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtContractorCN;
-        
+
+        /// <summary>
+        /// txtContractorShortName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtContractorShortName;
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -218,7 +229,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnDelete 控件。
         /// </summary>
@@ -227,7 +238,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnDelete;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -236,7 +247,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -245,7 +256,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -254,7 +265,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs b/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs
index 1942019..3f89485 100644
--- a/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs
+++ b/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs
@@ -11,6 +11,7 @@ using System.IO;
 using System.Linq;
 using System.Web.UI.WebControls;
 using System.Threading;
+using NPOI.SS.Formula.Functions;
 
 namespace FineUIPro.Web.Evaluation
 {
@@ -129,6 +130,12 @@ namespace FineUIPro.Web.Evaluation
         }
         #endregion
 
+        #region 按月提取数据
+        /// <summary>
+        /// 按月提取数据
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         protected void btnExtractMonth_Click(object sender, EventArgs e)
         {
             Thread t = new Thread(new ThreadStart(() => { ExtractMonthData(this.CurrUser.UserId); }));
@@ -159,8 +166,12 @@ namespace FineUIPro.Web.Evaluation
             Funs.DB.FC_NoEvaluatedUser.DeleteAllOnSubmit(deNoEva);
             Funs.DB.SubmitChanges();
 
+            var departEva = (from x in Funs.DB.FC_BigDepartEvaRate where x.ReportMonth == txtStartTime.Text select x).ToList();
+            Funs.DB.FC_BigDepartEvaRate.DeleteAllOnSubmit(departEva);
+            Funs.DB.SubmitChanges();
+
             #region
-            percentIn[UserId] = (int)(100 / 4);
+            percentIn[UserId] = (int)(100 / 5);
 
             List<Model.FC_OverviewReport> ovList = new List<Model.FC_OverviewReport>();
             List<SqlParameter> overParam = new List<SqlParameter>();
@@ -177,6 +188,9 @@ namespace FineUIPro.Web.Evaluation
                     ov.FO_NO = OverviewReport.Rows[i]["FO_NO"].ToString();
                     ov.Work_Description = OverviewReport.Rows[i]["Work_Description"].ToString();
                     ov.Contractor = OverviewReport.Rows[i]["Contractor"].ToString();
+                    ov.ContractorCN = OverviewReport.Rows[i]["ContractorCN"].ToString();
+                    ov.ContractorEN = OverviewReport.Rows[i]["ContractorEN"].ToString();
+                    ov.ContractorShortName = OverviewReport.Rows[i]["ContractorShortName"].ToString();
                     ov.Main_Coordinator = OverviewReport.Rows[i]["Main_Coordinator"].ToString();
                     ov.Total = Convert.ToDecimal(OverviewReport.Rows[i]["Total"]);
                     ov.Participation_Rate = Convert.ToDecimal(OverviewReport.Rows[i]["Participation_Rate"]);
@@ -359,7 +373,7 @@ namespace FineUIPro.Web.Evaluation
             #endregion
 
             #region
-            percentIn[UserId] = (int)((100 * 2) / 4);
+            percentIn[UserId] = (int)((100 * 2) / 5);
 
             List<Model.FC_OverviewReport> ovList1 = new List<Model.FC_OverviewReport>();
             List<SqlParameter> overParam1 = new List<SqlParameter>();
@@ -376,6 +390,9 @@ namespace FineUIPro.Web.Evaluation
                     ov.FO_NO = OverviewReport.Rows[i]["FO_NO"].ToString();
                     ov.Work_Description = OverviewReport.Rows[i]["Work_Description"].ToString();
                     ov.Contractor = OverviewReport.Rows[i]["Contractor"].ToString();
+                    ov.ContractorCN = OverviewReport.Rows[i]["ContractorCN"].ToString();
+                    ov.ContractorEN = OverviewReport.Rows[i]["ContractorEN"].ToString();
+                    ov.ContractorShortName = OverviewReport.Rows[i]["ContractorShortName"].ToString();
                     ov.Main_Coordinator = OverviewReport.Rows[i]["Main_Coordinator"].ToString();
                     ov.Total = Convert.ToDecimal(OverviewReport.Rows[i]["Total"]);
                     ov.Participation_Rate = Convert.ToDecimal(OverviewReport.Rows[i]["Participation_Rate"]);
@@ -557,7 +574,7 @@ namespace FineUIPro.Web.Evaluation
             #endregion
 
             #region
-            percentIn[UserId] = (int)((100 * 3) / 4);
+            percentIn[UserId] = (int)((100 * 3) / 5);
 
             List<Model.FC_NoEvaluatedUser> NoEvalUserList = new List<Model.FC_NoEvaluatedUser>();
             List<SqlParameter> param = new List<SqlParameter>();
@@ -755,6 +772,8 @@ namespace FineUIPro.Web.Evaluation
             #endregion
 
             #region
+            percentIn[UserId] = (int)((100 * 4) / 5);
+
             List<Model.FC_NoEvaluatedUser> NoEvalUserList1 = new List<Model.FC_NoEvaluatedUser>();
             List<SqlParameter> param1 = new List<SqlParameter>();
             param1.Add(new SqlParameter("@StartTime", sTime));
@@ -950,8 +969,48 @@ namespace FineUIPro.Web.Evaluation
             percentIn[UserId] = (int)((100 * 4) / 4);
 
             #endregion
-        }
 
+            #region 参与率
+            percentIn[UserId] = (int)((100 * 5) / 5);
+            List<Model.FC_BigDepartEvaRate> departEvaRateList = new List<Model.FC_BigDepartEvaRate>();
+            List<SqlParameter> departEvaRateParam1 = new List<SqlParameter>();
+            departEvaRateParam1.Add(new SqlParameter("@StartTime", sTime));
+            departEvaRateParam1.Add(new SqlParameter("@EndTime", eTime));
+            SqlParameter[] departEvaRateList1 = departEvaRateParam1.ToArray();
+            DataTable departEvaRate = SQLHelper.GetDataTableRunProc("sp_DepParticipationRate", departEvaRateList1);
+            if (departEvaRate.Rows.Count > 0)
+            {
+                for (int i = 0; i < departEvaRate.Rows.Count; i++)
+                {
+                    Model.FC_BigDepartEvaRate ov = new Model.FC_BigDepartEvaRate();
+                    ov.ReportMonth = departEvaRate.Rows[i]["ReportMonth"].ToString();
+                    ov.Depart = departEvaRate.Rows[i]["DepartCode"].ToString().Replace("Z", "");
+                    ov.Team = departEvaRate.Rows[i]["SubDepartCode"].ToString();
+                    ov.Participation_Rate = Convert.ToDecimal(departEvaRate.Rows[i]["Rate"]);
+                    if (ov.Team != null && !string.IsNullOrEmpty(ov.Team))
+                    {
+                        ov.Participation_Rate_Type = "团队参与率";
+                    }
+                    else
+                    {
+                        ov.Participation_Rate_Type = "部门参与率";
+                    }
+                    ov.IsSafe = true;
+                    departEvaRateList.Add(ov);
+                }
+            }
+            Funs.DB.FC_BigDepartEvaRate.InsertAllOnSubmit(departEvaRateList);
+            Funs.DB.SubmitChanges();
+            #endregion
+        }
+        #endregion
+
+        #region 提取全部数据
+        /// <summary>
+        /// 提前全部数据
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         protected void btnExtract_Click(object sender, EventArgs e)
         {
             Thread t = new Thread(new ThreadStart(() => { ExtractData(this.CurrUser.UserId); }));
@@ -980,6 +1039,10 @@ namespace FineUIPro.Web.Evaluation
             Funs.DB.FC_NoEvaluatedUser.DeleteAllOnSubmit(deNoEva);
             Funs.DB.SubmitChanges();
 
+            var departEva = (from x in Funs.DB.FC_BigDepartEvaRate where x.ReportMonth == txtStartTime.Text select x).ToList();
+            Funs.DB.FC_BigDepartEvaRate.DeleteAllOnSubmit(departEva);
+            Funs.DB.SubmitChanges();
+
             var mindate = (from x in Funs.DB.FC_Score select x.DateIn).Min();
             var maxdate = (from x in Funs.DB.FC_Score select x.DateIn).Max();
             int toDiff = ((maxdate.Value.Year - mindate.Value.Year) * 12) + maxdate.Value.Month - mindate.Value.Month;
@@ -987,9 +1050,10 @@ namespace FineUIPro.Web.Evaluation
             DateTime eTime = DateTime.Parse(mindate.Value.Year.ToString() + "-" + mindate.Value.Month.ToString() + "-13");
 
 
+            #region 
             for (int j = 0; j < toDiff; j++)
             {
-                percentIn[UserId] = (int)(100 * (j + 1) / (toDiff * 4));
+                percentIn[UserId] = (int)(100 * (j + 1) / (toDiff * 5));
 
                 List<Model.FC_OverviewReport> ovList = new List<Model.FC_OverviewReport>();
                 List<SqlParameter> overParam = new List<SqlParameter>();
@@ -1006,6 +1070,9 @@ namespace FineUIPro.Web.Evaluation
                         ov.FO_NO = OverviewReport.Rows[i]["FO_NO"].ToString();
                         ov.Work_Description = OverviewReport.Rows[i]["Work_Description"].ToString();
                         ov.Contractor = OverviewReport.Rows[i]["Contractor"].ToString();
+                        ov.ContractorCN = OverviewReport.Rows[i]["ContractorCN"].ToString();
+                        ov.ContractorEN = OverviewReport.Rows[i]["ContractorEN"].ToString();
+                        ov.ContractorShortName = OverviewReport.Rows[i]["ContractorShortName"].ToString();
                         ov.Main_Coordinator = OverviewReport.Rows[i]["Main_Coordinator"].ToString();
                         ov.Total = Convert.ToDecimal(OverviewReport.Rows[i]["Total"]);
                         ov.Participation_Rate = Convert.ToDecimal(OverviewReport.Rows[i]["Participation_Rate"]);
@@ -1184,12 +1251,12 @@ namespace FineUIPro.Web.Evaluation
                 }
                 Funs.DB.FC_OverviewReport.InsertAllOnSubmit(ovList);
                 Funs.DB.SubmitChanges();
-
             }
-
+            #endregion
+            #region
             for (int j = 0; j < toDiff; j++)
             {
-                percentIn[UserId] = (int)((100 * (j + 1+ toDiff)) / (toDiff * 4));
+                percentIn[UserId] = (int)((100 * (j + 1+ toDiff)) / (toDiff * 5));
 
                 List<Model.FC_OverviewReport> ovList = new List<Model.FC_OverviewReport>();
                 List<SqlParameter> overParam = new List<SqlParameter>();
@@ -1206,6 +1273,9 @@ namespace FineUIPro.Web.Evaluation
                         ov.FO_NO = OverviewReport.Rows[i]["FO_NO"].ToString();
                         ov.Work_Description = OverviewReport.Rows[i]["Work_Description"].ToString();
                         ov.Contractor = OverviewReport.Rows[i]["Contractor"].ToString();
+                        ov.ContractorCN = OverviewReport.Rows[i]["ContractorCN"].ToString();
+                        ov.ContractorEN = OverviewReport.Rows[i]["ContractorEN"].ToString();
+                        ov.ContractorShortName = OverviewReport.Rows[i]["ContractorShortName"].ToString();
                         ov.Main_Coordinator = OverviewReport.Rows[i]["Main_Coordinator"].ToString();
                         ov.Total = Convert.ToDecimal(OverviewReport.Rows[i]["Total"]);
                         ov.Participation_Rate = Convert.ToDecimal(OverviewReport.Rows[i]["Participation_Rate"]);
@@ -1386,10 +1456,11 @@ namespace FineUIPro.Web.Evaluation
                 Funs.DB.SubmitChanges();
 
             }
-
+            #endregion
+            #region
             for (int j = 0; j < toDiff; j++)
             {
-                percentIn[UserId] = (int)((100 * (j + 1 + toDiff * 2)) / (toDiff * 4));
+                percentIn[UserId] = (int)((100 * (j + 1 + toDiff * 2)) / (toDiff * 5));
 
                 List<Model.FC_NoEvaluatedUser> NoEvalUserList = new List<Model.FC_NoEvaluatedUser>();
                 List<SqlParameter> param = new List<SqlParameter>();
@@ -1585,10 +1656,11 @@ namespace FineUIPro.Web.Evaluation
                     Funs.DB.SubmitChanges();
                 }
             }
-
+            #endregion
+            #region
             for (int j = 0; j < toDiff; j++)
             {
-                percentIn[UserId] = (int)((100 * (j + 1 + toDiff * 3)) / (toDiff * 4));
+                percentIn[UserId] = (int)((100 * (j + 1 + toDiff * 3)) / (toDiff * 5));
 
                 List<Model.FC_NoEvaluatedUser> NoEvalUserList = new List<Model.FC_NoEvaluatedUser>();
                 List<SqlParameter> param = new List<SqlParameter>();
@@ -1784,6 +1856,64 @@ namespace FineUIPro.Web.Evaluation
                     Funs.DB.SubmitChanges();
                 }
             }
+            #endregion
+
+            for (int j = 0; j < toDiff; j++)
+            {
+                percentIn[UserId] = (int)(100 * (j + 4) / (toDiff * 5));
+
+                //List<Model.FC_BigDepartEvaRate> ovList = new List<Model.FC_BigDepartEvaRate>();
+                //List<SqlParameter> overParam = new List<SqlParameter>();
+                //overParam.Add(new SqlParameter("@StartTime", sTime.AddMonths(j)));
+                //overParam.Add(new SqlParameter("@EndTime", eTime.AddMonths(j)));
+                //SqlParameter[] overParList = overParam.ToArray();
+                //DataTable OverviewReport = SQLHelper.GetDataTableRunProc("sp_DepParticipationRate", overParList);
+                //if (OverviewReport.Rows.Count > 0)
+                //{
+                //    for (int i = 0; i < OverviewReport.Rows.Count; i++)
+                //    {
+                //        Model.FC_OverviewReport ov = new Model.FC_OverviewReport();
+                //        ov.ReportMonth = OverviewReport.Rows[i]["ReportMonth"].ToString();
+                //        ov.Participation_Rate = Convert.ToDecimal(OverviewReport.Rows[i]["Participation_Rate"]);
+
+                       
+                //        ov.IsSafe = false;
+                //        ovList.Add(ov);
+                //    }
+                //}
+                //Funs.DB.FC_OverviewReport.InsertAllOnSubmit(ovList);
+                //Funs.DB.SubmitChanges();
+
+                List<Model.FC_BigDepartEvaRate> departEvaRateList = new List<Model.FC_BigDepartEvaRate>();
+                List<SqlParameter> departEvaRateParam1 = new List<SqlParameter>();
+                departEvaRateParam1.Add(new SqlParameter("@StartTime", sTime.AddMonths(j)));
+                departEvaRateParam1.Add(new SqlParameter("@EndTime", eTime.AddMonths(j)));
+                SqlParameter[] departEvaRateList1 = departEvaRateParam1.ToArray();
+                DataTable departEvaRate = SQLHelper.GetDataTableRunProc("sp_DepParticipationRate", departEvaRateList1);
+                if (departEvaRate.Rows.Count > 0)
+                {
+                    for (int i = 0; i < departEvaRate.Rows.Count; i++)
+                    {
+                        Model.FC_BigDepartEvaRate ov = new Model.FC_BigDepartEvaRate();
+                        ov.ReportMonth = departEvaRate.Rows[i]["ReportMonth"].ToString();
+                        ov.Depart = departEvaRate.Rows[i]["DepartCode"].ToString().Replace("Z", "");
+                        ov.Team = departEvaRate.Rows[i]["SubDepartCode"].ToString();
+                        ov.Participation_Rate = Convert.ToDecimal(departEvaRate.Rows[i]["Rate"]);
+                        if (ov.Team != null && !string.IsNullOrEmpty(ov.Team))
+                        {
+                            ov.Participation_Rate_Type = "团队参与率";
+                        }
+                        else
+                        {
+                            ov.Participation_Rate_Type = "部门参与率";
+                        }
+                        ov.IsSafe = false;
+                        departEvaRateList.Add(ov);
+                    }
+                    Funs.DB.FC_BigDepartEvaRate.InsertAllOnSubmit(departEvaRateList);
+                    Funs.DB.SubmitChanges();
+                }
+            }
             //if (j == 0)
             //{
             //    NewOverviewReport = OverviewReport.Copy();
@@ -1798,7 +1928,14 @@ namespace FineUIPro.Web.Evaluation
 
         }
 
+        #endregion
 
+        #region 导出中文版
+        /// <summary>
+        /// 导出中文版
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         protected void btnExportCN_Click(object sender, EventArgs e)
         {
             percent = 0;
@@ -1809,36 +1946,26 @@ namespace FineUIPro.Web.Evaluation
             List<Model.FC_OverviewReport> overviewReport = (from x in Funs.DB.FC_OverviewReport where x.IsSafe == false orderby x.ReportMonth, x.FO_NO select x).ToList();
             List<Model.FC_OverviewReport> safeOverviewReport = (from x in Funs.DB.FC_OverviewReport where x.IsSafe == true orderby x.ReportMonth, x.FO_NO select x).ToList();
             List<Model.FC_NoEvaluatedUser> noEvaluatedUser= (from x in Funs.DB.FC_NoEvaluatedUser  orderby x.ReportMonth, x.IsSafe select x).ToList();
+            List<Model.FC_BigDepartEvaRate> participationRateReport = (from x in Funs.DB.FC_BigDepartEvaRate orderby x.ReportMonth,x.Team select x).ToList();
+            List<Model.FC_SESReport> sesReportList = (from x in Funs.DB.FC_SESReport where x.Accepted != "" && x.Accepted != null select x).ToList();
 
-            Thread t = new Thread(new ThreadStart(() => { ExportCN(punishList, cmList, conList, overviewReport , safeOverviewReport, noEvaluatedUser); }));
+            Thread t = new Thread(new ThreadStart(() => { ExportCN(punishList, cmList, conList, overviewReport , safeOverviewReport, noEvaluatedUser, participationRateReport, sesReportList); }));
             t.Start();
             PageContext.RegisterStartupScript("showProcessBar()");
         }
+    
 
-        protected void btnExportEN_Click(object sender, EventArgs e)
-        {
-            percent = 0;
-            url = "";
-            List<Model.View_EMC_Punishment> punishList = (from x in Funs.DB.View_EMC_Punishment where x.Flag == "1" select x).ToList();
-            List<Model.View_FC_ContractManagement> cmList = (from x in Funs.DB.View_FC_ContractManagement where x.IsExport == true orderby x.FO_NO, x.FileType select x).ToList();
-            List<Model.View_FC_Contractor> conList = (from x in Funs.DB.View_FC_Contractor where x.FC_Status == "Valid" || x.FC_Status == "Expired Soon" orderby x.Contractor, x.Expire_Date select x).ToList();
-            List<Model.FC_OverviewReport> overviewReport = (from x in Funs.DB.FC_OverviewReport where x.IsSafe == false orderby x.ReportMonth, x.FO_NO select x).ToList();
-            List<Model.FC_OverviewReport> safeOverviewReport = (from x in Funs.DB.FC_OverviewReport where x.IsSafe == true orderby x.ReportMonth, x.FO_NO select x).ToList();
-            List<Model.FC_NoEvaluatedUser> noEvaluatedUser = (from x in Funs.DB.FC_NoEvaluatedUser orderby x.ReportMonth, x.IsSafe select x).ToList();
-
-            Thread t = new Thread(new ThreadStart(() => { ExportEN(punishList, cmList, conList, overviewReport, safeOverviewReport, noEvaluatedUser); }));
-            t.Start();
-            PageContext.RegisterStartupScript("showProcessBar()");
-        }
-
-        private void ExportCN(List<Model.View_EMC_Punishment> punishList, List<Model.View_FC_ContractManagement> cmList, List<Model.View_FC_Contractor> conList, List<Model.FC_OverviewReport> OverviewReport, List<Model.FC_OverviewReport> safeOverviewReport,List<Model.FC_NoEvaluatedUser> noEvaluatedUser)
+        private void ExportCN(List<Model.View_EMC_Punishment> punishList, List<Model.View_FC_ContractManagement> cmList, List<Model.View_FC_Contractor> conList, List<Model.FC_OverviewReport> OverviewReport, List<Model.FC_OverviewReport> safeOverviewReport,List<Model.FC_NoEvaluatedUser> noEvaluatedUser, List<Model.FC_BigDepartEvaRate> participationRateReport, List<Model.FC_SESReport> sesReportList)
         {
             int punishCount = punishList.Count();
             int cmListCount = cmList.Count();
             int conListCount = conList.Count();
             int overviewCount = OverviewReport.Count;
             int safeOverviewCount = safeOverviewReport.Count;
-            int totalNum = punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUser.Count;
+            int noEvaluatedUserCount = noEvaluatedUser.Count;
+            int sesReportCount = sesReportList.Count;
+            int participationRateCount = participationRateReport.Count;
+            int totalNum = punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUserCount + participationRateCount + sesReportCount;
             #region
             string rootPath = Server.MapPath("~/") + Const.ExcelUrl;
             //模板文件
@@ -1940,35 +2067,37 @@ namespace FineUIPro.Web.Evaluation
                     if (ws.GetRow(rowIndex).GetCell(9) == null) ws.GetRow(rowIndex).CreateCell(9);
                     ws.GetRow(rowIndex).GetCell(9).SetCellValue(p.ContractorEn);
                     if (ws.GetRow(rowIndex).GetCell(10) == null) ws.GetRow(rowIndex).CreateCell(10);
-                    ws.GetRow(rowIndex).GetCell(10).SetCellValue(p.Location);
+                    ws.GetRow(rowIndex).GetCell(10).SetCellValue(p.ContractorShortName);
                     if (ws.GetRow(rowIndex).GetCell(11) == null) ws.GetRow(rowIndex).CreateCell(11);
-                    ws.GetRow(rowIndex).GetCell(11).SetCellValue(p.Description);
+                    ws.GetRow(rowIndex).GetCell(11).SetCellValue(p.Location);
                     if (ws.GetRow(rowIndex).GetCell(12) == null) ws.GetRow(rowIndex).CreateCell(12);
-                    ws.GetRow(rowIndex).GetCell(12).SetCellValue(p.Company != null ? p.Company.Value.ToString("0.00") : "");
+                    ws.GetRow(rowIndex).GetCell(12).SetCellValue(p.Description);
                     if (ws.GetRow(rowIndex).GetCell(13) == null) ws.GetRow(rowIndex).CreateCell(13);
-                    ws.GetRow(rowIndex).GetCell(13).SetCellValue(p.Individual != null ? p.Individual.Value.ToString("0.00") : "");
+                    ws.GetRow(rowIndex).GetCell(13).SetCellValue(p.Company != null ? p.Company.Value.ToString("0.00") : "");
                     if (ws.GetRow(rowIndex).GetCell(14) == null) ws.GetRow(rowIndex).CreateCell(14);
-                    ws.GetRow(rowIndex).GetCell(14).SetCellValue(p.Backcharge != null ? p.Backcharge.Value.ToString("0.00") : "");
+                    ws.GetRow(rowIndex).GetCell(14).SetCellValue(p.Individual != null ? p.Individual.Value.ToString("0.00") : "");
                     if (ws.GetRow(rowIndex).GetCell(15) == null) ws.GetRow(rowIndex).CreateCell(15);
-                    ws.GetRow(rowIndex).GetCell(15).SetCellValue(p.ViolationDegree);
+                    ws.GetRow(rowIndex).GetCell(15).SetCellValue(p.Backcharge != null ? p.Backcharge.Value.ToString("0.00") : "");
                     if (ws.GetRow(rowIndex).GetCell(16) == null) ws.GetRow(rowIndex).CreateCell(16);
-                    ws.GetRow(rowIndex).GetCell(16).SetCellValue(p.Contract_Admin);
+                    ws.GetRow(rowIndex).GetCell(16).SetCellValue(p.ViolationDegree);
                     if (ws.GetRow(rowIndex).GetCell(17) == null) ws.GetRow(rowIndex).CreateCell(17);
-                    ws.GetRow(rowIndex).GetCell(17).SetCellValue(p.Main_Coordinator);
+                    ws.GetRow(rowIndex).GetCell(17).SetCellValue(p.Contract_Admin);
                     if (ws.GetRow(rowIndex).GetCell(18) == null) ws.GetRow(rowIndex).CreateCell(18);
-                    ws.GetRow(rowIndex).GetCell(18).SetCellValue(p.MCDept);
+                    ws.GetRow(rowIndex).GetCell(18).SetCellValue(p.Main_Coordinator);
                     if (ws.GetRow(rowIndex).GetCell(19) == null) ws.GetRow(rowIndex).CreateCell(19);
-                    ws.GetRow(rowIndex).GetCell(19).SetCellValue(p.User_Representative);
+                    ws.GetRow(rowIndex).GetCell(19).SetCellValue(p.MCDept);
                     if (ws.GetRow(rowIndex).GetCell(20) == null) ws.GetRow(rowIndex).CreateCell(20);
-                    ws.GetRow(rowIndex).GetCell(20).SetCellValue(p.BYCRU);
+                    ws.GetRow(rowIndex).GetCell(20).SetCellValue(p.User_Representative);
                     if (ws.GetRow(rowIndex).GetCell(21) == null) ws.GetRow(rowIndex).CreateCell(21);
-                    ws.GetRow(rowIndex).GetCell(21).SetCellValue(p.Violation_Inspector_Name);
+                    ws.GetRow(rowIndex).GetCell(21).SetCellValue(p.BYCRU);
                     if (ws.GetRow(rowIndex).GetCell(22) == null) ws.GetRow(rowIndex).CreateCell(22);
-                    ws.GetRow(rowIndex).GetCell(22).SetCellValue(p.InspectionDep);
+                    ws.GetRow(rowIndex).GetCell(22).SetCellValue(p.Violation_Inspector_Name);
                     if (ws.GetRow(rowIndex).GetCell(23) == null) ws.GetRow(rowIndex).CreateCell(23);
-                    ws.GetRow(rowIndex).GetCell(23).SetCellValue(p.SES_No);
+                    ws.GetRow(rowIndex).GetCell(23).SetCellValue(p.InspectionDep);
                     if (ws.GetRow(rowIndex).GetCell(24) == null) ws.GetRow(rowIndex).CreateCell(24);
-                    ws.GetRow(rowIndex).GetCell(24).SetCellValue(p.CompletionDate != null ? p.CompletionDate.Value.ToString("yyyy/MM/dd") : "");
+                    ws.GetRow(rowIndex).GetCell(24).SetCellValue(p.SES_No);
+                    if (ws.GetRow(rowIndex).GetCell(25) == null) ws.GetRow(rowIndex).CreateCell(25);
+                    ws.GetRow(rowIndex).GetCell(25).SetCellValue(p.CompletionDate != null ? p.CompletionDate.Value.ToString("yyyy/MM/dd") : "");
 
                     if ((int)(90 * (rowIndex) / totalNum) > percent)
                     {
@@ -2078,19 +2207,21 @@ namespace FineUIPro.Web.Evaluation
                     if (wsCm.GetRow(rowIndex).GetCell(7) == null) wsCm.GetRow(rowIndex).CreateCell(7);
                     wsCm.GetRow(rowIndex).GetCell(7).SetCellValue(p.ContractorEn);
                     if (wsCm.GetRow(rowIndex).GetCell(8) == null) wsCm.GetRow(rowIndex).CreateCell(8);
-                    wsCm.GetRow(rowIndex).GetCell(8).SetCellValue(p.Remark);
+                    wsCm.GetRow(rowIndex).GetCell(8).SetCellValue(p.ContractorShortName);
                     if (wsCm.GetRow(rowIndex).GetCell(9) == null) wsCm.GetRow(rowIndex).CreateCell(9);
-                    wsCm.GetRow(rowIndex).GetCell(9).SetCellValue(p.FileType);
+                    wsCm.GetRow(rowIndex).GetCell(9).SetCellValue(p.Remark);
                     if (wsCm.GetRow(rowIndex).GetCell(10) == null) wsCm.GetRow(rowIndex).CreateCell(10);
-                    wsCm.GetRow(rowIndex).GetCell(10).SetCellValue(p.Contract_Admin);
+                    wsCm.GetRow(rowIndex).GetCell(10).SetCellValue(p.FileType);
                     if (wsCm.GetRow(rowIndex).GetCell(11) == null) wsCm.GetRow(rowIndex).CreateCell(11);
-                    wsCm.GetRow(rowIndex).GetCell(11).SetCellValue(p.Main_Coordinator);
+                    wsCm.GetRow(rowIndex).GetCell(11).SetCellValue(p.Contract_Admin);
                     if (wsCm.GetRow(rowIndex).GetCell(12) == null) wsCm.GetRow(rowIndex).CreateCell(12);
-                    wsCm.GetRow(rowIndex).GetCell(12).SetCellValue(p.MCDept);
+                    wsCm.GetRow(rowIndex).GetCell(12).SetCellValue(p.Main_Coordinator);
                     if (wsCm.GetRow(rowIndex).GetCell(13) == null) wsCm.GetRow(rowIndex).CreateCell(13);
-                    wsCm.GetRow(rowIndex).GetCell(13).SetCellValue(p.User_Representative);
+                    wsCm.GetRow(rowIndex).GetCell(13).SetCellValue(p.MCDept);
                     if (wsCm.GetRow(rowIndex).GetCell(14) == null) wsCm.GetRow(rowIndex).CreateCell(14);
-                    wsCm.GetRow(rowIndex).GetCell(14).SetCellValue(p.BycDept);
+                    wsCm.GetRow(rowIndex).GetCell(14).SetCellValue(p.User_Representative);
+                    if (wsCm.GetRow(rowIndex).GetCell(15) == null) wsCm.GetRow(rowIndex).CreateCell(15);
+                    wsCm.GetRow(rowIndex).GetCell(15).SetCellValue(p.BycDept);
 
                     if ((int)((90 * (rowIndex + punishCount )) / totalNum) > percent)
                     {
@@ -2109,14 +2240,27 @@ namespace FineUIPro.Web.Evaluation
                 foreach (var p in conList)
                 {
                     if (wsCon.GetRow(rowIndex) == null) wsCon.CreateRow(rowIndex);
+                    //专业
                     if (wsCon.GetRow(rowIndex).GetCell(0) == null) wsCon.GetRow(rowIndex).CreateCell(0);
-                    wsCon.GetRow(rowIndex).GetCell(0).SetCellValue(p.Contractor);
+                    wsCon.GetRow(rowIndex).GetCell(0).SetCellValue(p.Discipline);
+                    //承包商名称
                     if (wsCon.GetRow(rowIndex).GetCell(1) == null) wsCon.GetRow(rowIndex).CreateCell(1);
-                    wsCon.GetRow(rowIndex).GetCell(1).SetCellValue(p.FO_NO);
+                    wsCon.GetRow(rowIndex).GetCell(1).SetCellValue(p.Contractor);
+                    //承包商（简称）
                     if (wsCon.GetRow(rowIndex).GetCell(2) == null) wsCon.GetRow(rowIndex).CreateCell(2);
-                    wsCon.GetRow(rowIndex).GetCell(2).SetCellValue(p.FC_Status);
+                    wsCon.GetRow(rowIndex).GetCell(2).SetCellValue(p.ContractorShortName);
+                    //合同号
                     if (wsCon.GetRow(rowIndex).GetCell(3) == null) wsCon.GetRow(rowIndex).CreateCell(3);
-                    wsCon.GetRow(rowIndex).GetCell(3).SetCellValue(p.Expire_Date != null ? p.Expire_Date.Value.ToString("yyyy/MM/dd") : "");
+                    wsCon.GetRow(rowIndex).GetCell(3).SetCellValue(p.FO_NO);
+                    //合同状态
+                    if (wsCon.GetRow(rowIndex).GetCell(4) == null) wsCon.GetRow(rowIndex).CreateCell(4);
+                    wsCon.GetRow(rowIndex).GetCell(4).SetCellValue(p.FC_Status);
+                    //生效时间
+                    if (wsCon.GetRow(rowIndex).GetCell(5) == null) wsCon.GetRow(rowIndex).CreateCell(5);
+                    wsCon.GetRow(rowIndex).GetCell(5).SetCellValue(p.Validate_Date != null ? p.Validate_Date.Value.ToString("yyyy/MM/dd") : "");
+                    //到期时间
+                    if (wsCon.GetRow(rowIndex).GetCell(6) == null) wsCon.GetRow(rowIndex).CreateCell(6);
+                    wsCon.GetRow(rowIndex).GetCell(6).SetCellValue(p.Expire_Date != null ? p.Expire_Date.Value.ToString("yyyy/MM/dd") : "");
 
                     if ((int)((90 * (rowIndex + punishCount + cmListCount)) / totalNum) > percent)
                     {
@@ -2127,8 +2271,8 @@ namespace FineUIPro.Web.Evaluation
             }
             #endregion
 
-            #region 非安全监护框架承包商绩效
-            XSSFSheet wss = (XSSFSheet)hssfworkbook.GetSheet("非安全监护框架承包商绩效");
+            #region 常规框架承包商绩效
+            XSSFSheet wss = (XSSFSheet)hssfworkbook.GetSheet("常规框架承包商绩效");
             if (overviewCount > 0)
             {
                 var rowIndex = 1;
@@ -2136,94 +2280,107 @@ namespace FineUIPro.Web.Evaluation
                 { 
                     if (wss.GetRow(rowIndex) == null) wss.CreateRow(rowIndex);
                     #region 列赋值
+                    //报告日期
                     if (wss.GetRow(rowIndex).GetCell(0) == null) wss.GetRow(rowIndex).CreateCell(0);
                     wss.GetRow(rowIndex).GetCell(0).SetCellValue(vs.ReportMonth);
                     wss.GetRow(rowIndex).GetCell(0).CellStyle = fontStyle;
-
+                    //合同号
                     if (wss.GetRow(rowIndex).GetCell(1) == null) wss.GetRow(rowIndex).CreateCell(1);
                     wss.GetRow(rowIndex).GetCell(1).SetCellValue(vs.FO_NO);
                     wss.GetRow(rowIndex).GetCell(1).CellStyle = fontStyle;
-
+                    //专业
                     if (wss.GetRow(rowIndex).GetCell(2) == null) wss.GetRow(rowIndex).CreateCell(2);
                     wss.GetRow(rowIndex).GetCell(2).SetCellValue(vs.Work_Description);
                     wss.GetRow(rowIndex).GetCell(2).CellStyle = fontStyle;
-
+                    //承包商名称
                     if (wss.GetRow(rowIndex).GetCell(3) == null) wss.GetRow(rowIndex).CreateCell(3);
                     wss.GetRow(rowIndex).GetCell(3).SetCellValue(vs.Contractor);
-                    wss.GetRow(rowIndex).GetCell(3).CellStyle = fontStyle;
-
+                    wss.GetRow(rowIndex).GetCell(3).CellStyle = fontStyle;                    
+                    //承包商（中）
                     if (wss.GetRow(rowIndex).GetCell(4) == null) wss.GetRow(rowIndex).CreateCell(4);
-                    wss.GetRow(rowIndex).GetCell(4).SetCellValue(vs.Main_Coordinator);
-                    wss.GetRow(rowIndex).GetCell(4).CellStyle = styleQfw1;
-
+                    wss.GetRow(rowIndex).GetCell(4).SetCellValue(vs.ContractorCN);
+                    wss.GetRow(rowIndex).GetCell(4).CellStyle = fontStyle;
+                    //承包商（英）
                     if (wss.GetRow(rowIndex).GetCell(5) == null) wss.GetRow(rowIndex).CreateCell(5);
-                    wss.GetRow(rowIndex).GetCell(5).SetCellValue(vs.Total != null ? float.Parse(vs.Total.ToString()) : 0);
-                    wss.GetRow(rowIndex).GetCell(5).CellStyle = rateStyle;
-
+                    wss.GetRow(rowIndex).GetCell(5).SetCellValue(vs.ContractorEN);
+                    wss.GetRow(rowIndex).GetCell(5).CellStyle = fontStyle;
+                    //承包商简称
                     if (wss.GetRow(rowIndex).GetCell(6) == null) wss.GetRow(rowIndex).CreateCell(6);
-                    wss.GetRow(rowIndex).GetCell(6).SetCellValue(vs.Participation_Rate != null ? vs.Participation_Rate.ToString() + "%" : "0");
-                    wss.GetRow(rowIndex).GetCell(6).CellStyle = styleQfw;
-
+                    wss.GetRow(rowIndex).GetCell(6).SetCellValue(vs.ContractorShortName);
+                    wss.GetRow(rowIndex).GetCell(6).CellStyle = fontStyle;
+                    //主协调员
                     if (wss.GetRow(rowIndex).GetCell(7) == null) wss.GetRow(rowIndex).CreateCell(7);
-                    wss.GetRow(rowIndex).GetCell(7).SetCellValue(vs.TotalAvgScore1 != null ? vs.TotalAvgScore1.ToString() : "");
-                    wss.GetRow(rowIndex).GetCell(7).CellStyle = styleQfw;
-
+                    wss.GetRow(rowIndex).GetCell(7).SetCellValue(vs.Main_Coordinator);
+                    wss.GetRow(rowIndex).GetCell(7).CellStyle = styleQfw1;
+                    //总分
                     if (wss.GetRow(rowIndex).GetCell(8) == null) wss.GetRow(rowIndex).CreateCell(8);
-                    wss.GetRow(rowIndex).GetCell(8).SetCellValue(vs.TotalAvgScore2 != null ? vs.TotalAvgScore2.ToString() : "");
-                    wss.GetRow(rowIndex).GetCell(8).CellStyle = styleQfw;
-
+                    wss.GetRow(rowIndex).GetCell(8).SetCellValue(vs.Total != null ? float.Parse(vs.Total.ToString()) : 0);
+                    wss.GetRow(rowIndex).GetCell(8).CellStyle = rateStyle;
+                    //参与率
                     if (wss.GetRow(rowIndex).GetCell(9) == null) wss.GetRow(rowIndex).CreateCell(9);
-                    wss.GetRow(rowIndex).GetCell(9).SetCellValue(vs.TotalAvgScore3 != null ? vs.TotalAvgScore3.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(9).SetCellValue(vs.Participation_Rate != null ? vs.Participation_Rate.ToString() + "%" : "0");
                     wss.GetRow(rowIndex).GetCell(9).CellStyle = styleQfw;
-
+                    //工作准备
                     if (wss.GetRow(rowIndex).GetCell(10) == null) wss.GetRow(rowIndex).CreateCell(10);
-                    wss.GetRow(rowIndex).GetCell(10).SetCellValue(vs.CTSSAvgScore != null ? vs.CTSSAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(10).SetCellValue(vs.TotalAvgScore1 != null ? vs.TotalAvgScore1.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(10).CellStyle = styleQfw;
-
+                    //工作表现
                     if (wss.GetRow(rowIndex).GetCell(11) == null) wss.GetRow(rowIndex).CreateCell(11);
-                    wss.GetRow(rowIndex).GetCell(11).SetCellValue(vs.CTSCAvgScore != null ? vs.CTSCAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(11).SetCellValue(vs.TotalAvgScore2 != null ? vs.TotalAvgScore2.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(11).CellStyle = styleQfw;
-
+                    //EHSS管理
                     if (wss.GetRow(rowIndex).GetCell(12) == null) wss.GetRow(rowIndex).CreateCell(12);
-                    decimal? tnum = (vs.TotalAvgScore3 != null ? vs.TotalAvgScore3 : 0) + (vs.CTSSAvgScore != null ? vs.CTSSAvgScore : 0) + (vs.CTSCAvgScore != null ? vs.CTSCAvgScore : 0);
-                    wss.GetRow(rowIndex).GetCell(12).SetCellValue(tnum != null && tnum != 0 ? tnum.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(12).SetCellValue(vs.TotalAvgScore3 != null ? vs.TotalAvgScore3.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(12).CellStyle = styleQfw;
-
+                    //安全监督
                     if (wss.GetRow(rowIndex).GetCell(13) == null) wss.GetRow(rowIndex).CreateCell(13);
-                    wss.GetRow(rowIndex).GetCell(13).SetCellValue(vs.TotalAvgScore4 != null ? vs.TotalAvgScore4.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(13).SetCellValue(vs.CTSSAvgScore != null ? vs.CTSSAvgScore.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(13).CellStyle = styleQfw;
-
+                    //安保
                     if (wss.GetRow(rowIndex).GetCell(14) == null) wss.GetRow(rowIndex).CreateCell(14);
-                    wss.GetRow(rowIndex).GetCell(14).SetCellValue(vs.TotalAvgScore5 != null ? vs.TotalAvgScore5.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(14).SetCellValue(vs.CTSCAvgScore != null ? vs.CTSCAvgScore.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(14).CellStyle = styleQfw;
-
+                    //安全分
                     if (wss.GetRow(rowIndex).GetCell(15) == null) wss.GetRow(rowIndex).CreateCell(15);
-                    wss.GetRow(rowIndex).GetCell(15).SetCellValue(vs.TotalAvgScore6 != null ? vs.TotalAvgScore6.ToString() : "");
+                    decimal? tnum = (vs.TotalAvgScore3 != null ? vs.TotalAvgScore3 : 0) + (vs.CTSSAvgScore != null ? vs.CTSSAvgScore : 0) + (vs.CTSCAvgScore != null ? vs.CTSCAvgScore : 0);
+                    wss.GetRow(rowIndex).GetCell(15).SetCellValue(tnum != null && tnum != 0 ? tnum.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(15).CellStyle = styleQfw;
-
+                    //质量控制
                     if (wss.GetRow(rowIndex).GetCell(16) == null) wss.GetRow(rowIndex).CreateCell(16);
-                    wss.GetRow(rowIndex).GetCell(16).SetCellValue(vs.TimelyAvgSocre != null ? vs.TimelyAvgSocre.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(16).SetCellValue(vs.TotalAvgScore4 != null ? vs.TotalAvgScore4.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(16).CellStyle = styleQfw;
-
+                    //时间管理
                     if (wss.GetRow(rowIndex).GetCell(17) == null) wss.GetRow(rowIndex).CreateCell(17);
-                    wss.GetRow(rowIndex).GetCell(17).SetCellValue(vs.HonestyAvgScore != null ? vs.HonestyAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(17).SetCellValue(vs.TotalAvgScore5 != null ? vs.TotalAvgScore5.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(17).CellStyle = styleQfw;
-
+                    //文档管理
                     if (wss.GetRow(rowIndex).GetCell(18) == null) wss.GetRow(rowIndex).CreateCell(18);
-                    wss.GetRow(rowIndex).GetCell(18).SetCellValue(vs.MainCoordinatorAvgScore != null ? vs.MainCoordinatorAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(18).SetCellValue(vs.TotalAvgScore6 != null ? vs.TotalAvgScore6.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(18).CellStyle = styleQfw;
-
+                    //结算递交及时性
                     if (wss.GetRow(rowIndex).GetCell(19) == null) wss.GetRow(rowIndex).CreateCell(19);
-                    wss.GetRow(rowIndex).GetCell(19).SetCellValue(vs.UserRepresentativeAvgScore != null ? vs.UserRepresentativeAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(19).SetCellValue(vs.TimelyAvgSocre != null ? vs.TimelyAvgSocre.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(19).CellStyle = styleQfw;
-
+                    //核减诚实度
                     if (wss.GetRow(rowIndex).GetCell(20) == null) wss.GetRow(rowIndex).CreateCell(20);
-                    wss.GetRow(rowIndex).GetCell(20).SetCellValue(vs.CTSTAvgScore != null ? vs.CTSTAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(20).SetCellValue(vs.HonestyAvgScore != null ? vs.HonestyAvgScore.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(20).CellStyle = styleQfw;
-
+                    //主协调员
                     if (wss.GetRow(rowIndex).GetCell(21) == null) wss.GetRow(rowIndex).CreateCell(21);
-                    wss.GetRow(rowIndex).GetCell(21).SetCellValue(vs.CTEDAvgScore != null ? vs.CTEDAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(21).SetCellValue(vs.MainCoordinatorAvgScore != null ? vs.MainCoordinatorAvgScore.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(21).CellStyle = styleQfw;
+                    //用户代表
+                    if (wss.GetRow(rowIndex).GetCell(22) == null) wss.GetRow(rowIndex).CreateCell(22);
+                    wss.GetRow(rowIndex).GetCell(22).SetCellValue(vs.UserRepresentativeAvgScore != null ? vs.UserRepresentativeAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(22).CellStyle = styleQfw;
+                    //SSR检查
+                    if (wss.GetRow(rowIndex).GetCell(23) == null) wss.GetRow(rowIndex).CreateCell(23);
+                    wss.GetRow(rowIndex).GetCell(23).SetCellValue(vs.CTSTAvgScore != null ? vs.CTSTAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(23).CellStyle = styleQfw;
+                    //合同管理
+                    if (wss.GetRow(rowIndex).GetCell(24) == null) wss.GetRow(rowIndex).CreateCell(24);
+                    wss.GetRow(rowIndex).GetCell(24).SetCellValue(vs.CTEDAvgScore != null ? vs.CTEDAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(24).CellStyle = styleQfw;
 
                     #endregion
                     if ((int)((90 * (rowIndex + punishCount + cmListCount + conListCount)) / totalNum) > percent)
@@ -2233,8 +2390,6 @@ namespace FineUIPro.Web.Evaluation
                     rowIndex++;
                 }
             }
-
-
             #endregion
 
             #region 安全监护框架承包商绩效
@@ -2246,90 +2401,103 @@ namespace FineUIPro.Web.Evaluation
                 {
                     if (wssafe.GetRow(rowIndex) == null) wssafe.CreateRow(rowIndex);
                     #region 列赋值
+                    //报告日期
                     if (wssafe.GetRow(rowIndex).GetCell(0) == null) wssafe.GetRow(rowIndex).CreateCell(0);
                     wssafe.GetRow(rowIndex).GetCell(0).SetCellValue(vs.ReportMonth);
                     wssafe.GetRow(rowIndex).GetCell(0).CellStyle = fontStyle;
-
+                    //合同号
                     if (wssafe.GetRow(rowIndex).GetCell(1) == null) wssafe.GetRow(rowIndex).CreateCell(1);
                     wssafe.GetRow(rowIndex).GetCell(1).SetCellValue(vs.FO_NO);
                     wssafe.GetRow(rowIndex).GetCell(1).CellStyle = fontStyle;
-
+                    //专业
                     if (wssafe.GetRow(rowIndex).GetCell(2) == null) wssafe.GetRow(rowIndex).CreateCell(2);
                     wssafe.GetRow(rowIndex).GetCell(2).SetCellValue(vs.Work_Description);
                     wssafe.GetRow(rowIndex).GetCell(2).CellStyle = fontStyle;
-
+                    //承包商名称
                     if (wssafe.GetRow(rowIndex).GetCell(3) == null) wssafe.GetRow(rowIndex).CreateCell(3);
                     wssafe.GetRow(rowIndex).GetCell(3).SetCellValue(vs.Contractor);
                     wssafe.GetRow(rowIndex).GetCell(3).CellStyle = fontStyle;
-
+                    //承包商（中）
                     if (wssafe.GetRow(rowIndex).GetCell(4) == null) wssafe.GetRow(rowIndex).CreateCell(4);
-                    wssafe.GetRow(rowIndex).GetCell(4).SetCellValue(vs.Main_Coordinator);
-                    wssafe.GetRow(rowIndex).GetCell(4).CellStyle = styleQfw1;
-
+                    wssafe.GetRow(rowIndex).GetCell(4).SetCellValue(vs.ContractorCN);
+                    wssafe.GetRow(rowIndex).GetCell(4).CellStyle = fontStyle;
+                    //承包商（英）
                     if (wssafe.GetRow(rowIndex).GetCell(5) == null) wssafe.GetRow(rowIndex).CreateCell(5);
-                    wssafe.GetRow(rowIndex).GetCell(5).SetCellValue(vs.Total != null ? float.Parse(vs.Total.ToString()) : 0);
-                    wssafe.GetRow(rowIndex).GetCell(5).CellStyle = rateStyle;
-
+                    wssafe.GetRow(rowIndex).GetCell(5).SetCellValue(vs.ContractorEN);
+                    wssafe.GetRow(rowIndex).GetCell(5).CellStyle = fontStyle;
+                    //承包商（简称）
                     if (wssafe.GetRow(rowIndex).GetCell(6) == null) wssafe.GetRow(rowIndex).CreateCell(6);
-                    wssafe.GetRow(rowIndex).GetCell(6).SetCellValue(vs.Participation_Rate != null ? vs.Participation_Rate.ToString() + "%" : "0");
-                    wssafe.GetRow(rowIndex).GetCell(6).CellStyle = styleQfw;
-
+                    wssafe.GetRow(rowIndex).GetCell(6).SetCellValue(vs.ContractorShortName);
+                    wssafe.GetRow(rowIndex).GetCell(6).CellStyle = fontStyle;
+                    //主协调员
                     if (wssafe.GetRow(rowIndex).GetCell(7) == null) wssafe.GetRow(rowIndex).CreateCell(7);
-                    wssafe.GetRow(rowIndex).GetCell(7).SetCellValue(vs.TotalAvgScore1 != null ? vs.TotalAvgScore1.ToString() : "");
-                    wssafe.GetRow(rowIndex).GetCell(7).CellStyle = styleQfw;
-
+                    wssafe.GetRow(rowIndex).GetCell(7).SetCellValue(vs.Main_Coordinator);
+                    wssafe.GetRow(rowIndex).GetCell(7).CellStyle = styleQfw1;
+                    //总分
                     if (wssafe.GetRow(rowIndex).GetCell(8) == null) wssafe.GetRow(rowIndex).CreateCell(8);
-                    wssafe.GetRow(rowIndex).GetCell(8).SetCellValue(vs.TotalAvgScore2 != null ? vs.TotalAvgScore2.ToString() : "");
-                    wssafe.GetRow(rowIndex).GetCell(8).CellStyle = styleQfw;
-
+                    wssafe.GetRow(rowIndex).GetCell(8).SetCellValue(vs.Total != null ? float.Parse(vs.Total.ToString()) : 0);
+                    wssafe.GetRow(rowIndex).GetCell(8).CellStyle = rateStyle;
+                    //参与率
                     if (wssafe.GetRow(rowIndex).GetCell(9) == null) wssafe.GetRow(rowIndex).CreateCell(9);
-                    wssafe.GetRow(rowIndex).GetCell(9).SetCellValue(vs.TotalAvgScore3 != null ? vs.TotalAvgScore3.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(9).SetCellValue(vs.Participation_Rate != null ? vs.Participation_Rate.ToString() + "%" : "0");
                     wssafe.GetRow(rowIndex).GetCell(9).CellStyle = styleQfw;
-
+                    //人力资源
                     if (wssafe.GetRow(rowIndex).GetCell(10) == null) wssafe.GetRow(rowIndex).CreateCell(10);
-                    wssafe.GetRow(rowIndex).GetCell(10).SetCellValue(vs.CTSSAvgScore != null ? vs.CTSSAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(10).SetCellValue(vs.TotalAvgScore1 != null ? vs.TotalAvgScore1.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(10).CellStyle = styleQfw;
-
+                    //工作表现
                     if (wssafe.GetRow(rowIndex).GetCell(11) == null) wssafe.GetRow(rowIndex).CreateCell(11);
-                    wssafe.GetRow(rowIndex).GetCell(11).SetCellValue(vs.CTSCAvgScore != null ? vs.CTSCAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(11).SetCellValue(vs.TotalAvgScore2 != null ? vs.TotalAvgScore2.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(11).CellStyle = styleQfw;
-
+                    //EHSS管理
                     if (wssafe.GetRow(rowIndex).GetCell(12) == null) wssafe.GetRow(rowIndex).CreateCell(12);
-                    decimal? tnum = (vs.TotalAvgScore3 != null ? vs.TotalAvgScore3 : 0) + (vs.CTSSAvgScore != null ? vs.CTSSAvgScore : 0) + (vs.CTSCAvgScore != null ? vs.CTSCAvgScore : 0);
-                    wssafe.GetRow(rowIndex).GetCell(12).SetCellValue(tnum != null && tnum != 0 ? tnum.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(12).SetCellValue(vs.TotalAvgScore3 != null ? vs.TotalAvgScore3.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(12).CellStyle = styleQfw;
-
+                    //安全监管
                     if (wssafe.GetRow(rowIndex).GetCell(13) == null) wssafe.GetRow(rowIndex).CreateCell(13);
-                    wssafe.GetRow(rowIndex).GetCell(13).SetCellValue(vs.TotalAvgScore5 != null ? vs.TotalAvgScore5.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(13).SetCellValue(vs.CTSSAvgScore != null ? vs.CTSSAvgScore.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(13).CellStyle = styleQfw;
-
+                    //安保
                     if (wssafe.GetRow(rowIndex).GetCell(14) == null) wssafe.GetRow(rowIndex).CreateCell(14);
-                    wssafe.GetRow(rowIndex).GetCell(14).SetCellValue(vs.TotalAvgScore6 != null ? vs.TotalAvgScore6.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(14).SetCellValue(vs.CTSCAvgScore != null ? vs.CTSCAvgScore.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(14).CellStyle = styleQfw;
-
+                    //安全分
                     if (wssafe.GetRow(rowIndex).GetCell(15) == null) wssafe.GetRow(rowIndex).CreateCell(15);
-                    wssafe.GetRow(rowIndex).GetCell(15).SetCellValue(vs.TimelyAvgSocre != null ? vs.TimelyAvgSocre.ToString() : "");
+                    decimal? tnum = (vs.TotalAvgScore3 != null ? vs.TotalAvgScore3 : 0) + (vs.CTSSAvgScore != null ? vs.CTSSAvgScore : 0) + (vs.CTSCAvgScore != null ? vs.CTSCAvgScore : 0);
+                    wssafe.GetRow(rowIndex).GetCell(15).SetCellValue(tnum != null && tnum != 0 ? tnum.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(15).CellStyle = styleQfw;
-
+                    //时间管理
                     if (wssafe.GetRow(rowIndex).GetCell(16) == null) wssafe.GetRow(rowIndex).CreateCell(16);
-                    wssafe.GetRow(rowIndex).GetCell(16).SetCellValue(vs.HonestyAvgScore != null ? vs.HonestyAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(16).SetCellValue(vs.TotalAvgScore5 != null ? vs.TotalAvgScore5.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(16).CellStyle = styleQfw;
-
+                    //文档管理
                     if (wssafe.GetRow(rowIndex).GetCell(17) == null) wssafe.GetRow(rowIndex).CreateCell(17);
-                    wssafe.GetRow(rowIndex).GetCell(17).SetCellValue(vs.MainCoordinatorAvgScore != null ? vs.MainCoordinatorAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(17).SetCellValue(vs.TotalAvgScore6 != null ? vs.TotalAvgScore6.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(17).CellStyle = styleQfw;
-
+                    //结算递交及时性
                     if (wssafe.GetRow(rowIndex).GetCell(18) == null) wssafe.GetRow(rowIndex).CreateCell(18);
-                    wssafe.GetRow(rowIndex).GetCell(18).SetCellValue(vs.UserRepresentativeAvgScore != null ? vs.UserRepresentativeAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(18).SetCellValue(vs.TimelyAvgSocre != null ? vs.TimelyAvgSocre.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(18).CellStyle = styleQfw;
-
+                    //核减诚实度
                     if (wssafe.GetRow(rowIndex).GetCell(19) == null) wssafe.GetRow(rowIndex).CreateCell(19);
-                    wssafe.GetRow(rowIndex).GetCell(19).SetCellValue(vs.CTSTAvgScore != null ? vs.CTSTAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(19).SetCellValue(vs.HonestyAvgScore != null ? vs.HonestyAvgScore.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(19).CellStyle = styleQfw;
-
+                    //主协调员
                     if (wssafe.GetRow(rowIndex).GetCell(20) == null) wssafe.GetRow(rowIndex).CreateCell(20);
-                    wssafe.GetRow(rowIndex).GetCell(20).SetCellValue(vs.CTEDAvgScore != null ? vs.CTEDAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(20).SetCellValue(vs.MainCoordinatorAvgScore != null ? vs.MainCoordinatorAvgScore.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(20).CellStyle = styleQfw;
+                    //用户代表
+                    if (wssafe.GetRow(rowIndex).GetCell(21) == null) wssafe.GetRow(rowIndex).CreateCell(21);
+                    wssafe.GetRow(rowIndex).GetCell(21).SetCellValue(vs.UserRepresentativeAvgScore != null ? vs.UserRepresentativeAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(21).CellStyle = styleQfw;
+                    //SSR检查
+                    if (wssafe.GetRow(rowIndex).GetCell(22) == null) wssafe.GetRow(rowIndex).CreateCell(22);
+                    wssafe.GetRow(rowIndex).GetCell(22).SetCellValue(vs.CTSTAvgScore != null ? vs.CTSTAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(22).CellStyle = styleQfw;
+                    //合同管理
+                    if (wssafe.GetRow(rowIndex).GetCell(23) == null) wssafe.GetRow(rowIndex).CreateCell(23);
+                    wssafe.GetRow(rowIndex).GetCell(23).SetCellValue(vs.CTEDAvgScore != null ? vs.CTEDAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(23).CellStyle = styleQfw;
 
                     #endregion
                     if ((int)((90 * (rowIndex + punishCount + cmListCount + conListCount + overviewCount)) / totalNum) > percent)
@@ -2352,27 +2520,39 @@ namespace FineUIPro.Web.Evaluation
                     if (wsevalu.GetRow(rowEvalIndex) == null) wsevalu.CreateRow(rowEvalIndex);
 
                     #region 列赋值
+                    //报告日期
                     if (wsevalu.GetRow(rowEvalIndex).GetCell(0) == null) wsevalu.GetRow(rowEvalIndex).CreateCell(0);
                     wsevalu.GetRow(rowEvalIndex).GetCell(0).SetCellValue(item.ReportMonth);
                     wsevalu.GetRow(rowEvalIndex).GetCell(0).CellStyle = fontStyle;
+                    //合同类型
                     if (wsevalu.GetRow(rowEvalIndex).GetCell(1) == null) wsevalu.GetRow(rowEvalIndex).CreateCell(1);
                     wsevalu.GetRow(rowEvalIndex).GetCell(1).SetCellValue(item.IsSafe == false ? "非安全" : "安全");
                     wsevalu.GetRow(rowEvalIndex).GetCell(1).CellStyle = fontStyle;
+                    //姓名
                     if (wsevalu.GetRow(rowEvalIndex).GetCell(2) == null) wsevalu.GetRow(rowEvalIndex).CreateCell(2);
                     wsevalu.GetRow(rowEvalIndex).GetCell(2).SetCellValue(item.UserName);
                     wsevalu.GetRow(rowEvalIndex).GetCell(2).CellStyle = fontStyle;
+                    //账号
                     if (wsevalu.GetRow(rowEvalIndex).GetCell(3) == null) wsevalu.GetRow(rowEvalIndex).CreateCell(3);
                     wsevalu.GetRow(rowEvalIndex).GetCell(3).SetCellValue(item.Account);
                     wsevalu.GetRow(rowEvalIndex).GetCell(3).CellStyle = fontStyle;
+                    //是否评价
                     if (wsevalu.GetRow(rowEvalIndex).GetCell(4) == null) wsevalu.GetRow(rowEvalIndex).CreateCell(4);
                     wsevalu.GetRow(rowEvalIndex).GetCell(4).SetCellValue(item.IsEvaluate);
                     wsevalu.GetRow(rowEvalIndex).GetCell(4).CellStyle = fontStyle;
+                    //身份
                     if (wsevalu.GetRow(rowEvalIndex).GetCell(5) == null) wsevalu.GetRow(rowEvalIndex).CreateCell(5);
                     wsevalu.GetRow(rowEvalIndex).GetCell(5).SetCellValue(item.RoleName);
                     wsevalu.GetRow(rowEvalIndex).GetCell(5).CellStyle = fontStyle;
+                    //部门
                     if (wsevalu.GetRow(rowEvalIndex).GetCell(6) == null) wsevalu.GetRow(rowEvalIndex).CreateCell(6);
-                    wsevalu.GetRow(rowEvalIndex).GetCell(6).SetCellValue(item.DepartName);
+                    wsevalu.GetRow(rowEvalIndex).GetCell(6).SetCellValue(item.DepartName.Substring(0, item.DepartName.LastIndexOf("/")));
                     wsevalu.GetRow(rowEvalIndex).GetCell(6).CellStyle = fontStyle;
+                    //团队
+                    if (wsevalu.GetRow(rowEvalIndex).GetCell(7) == null) wsevalu.GetRow(rowEvalIndex).CreateCell(7);
+                    wsevalu.GetRow(rowEvalIndex).GetCell(7).SetCellValue(item.DepartName);
+                    wsevalu.GetRow(rowEvalIndex).GetCell(7).CellStyle = fontStyle;
+
                     //if (wsevalu.GetRow(rowEvalIndex).GetCell(6) == null) wsevalu.GetRow(rowEvalIndex).CreateCell(6);
                     //wsevalu.GetRow(rowEvalIndex).GetCell(6).SetCellValue(item.NotEvaluatedFoNo);
                     //wsevalu.GetRow(rowEvalIndex).GetCell(6).CellStyle = fontStyle;
@@ -2384,13 +2564,13 @@ namespace FineUIPro.Web.Evaluation
                         {
                             if (findex < 250)
                             {
-                                if (wsevalu.GetRow(0).GetCell(7 + findex) == null) wsevalu.GetRow(0).CreateCell(7 + findex);
-                                wsevalu.GetRow(0).GetCell(7 + findex).SetCellValue("未评价合同号"+ (findex+1).ToString());
-                                wsevalu.GetRow(0).GetCell(7 + findex).CellStyle = wsevalu.GetRow(0).GetCell(7).CellStyle;
+                                if (wsevalu.GetRow(0).GetCell(8 + findex) == null) wsevalu.GetRow(0).CreateCell(8 + findex);
+                                wsevalu.GetRow(0).GetCell(8 + findex).SetCellValue("未评价合同号"+ (findex+1).ToString());
+                                wsevalu.GetRow(0).GetCell(8 + findex).CellStyle = wsevalu.GetRow(0).GetCell(8).CellStyle;
                                 
-                                if (wsevalu.GetRow(rowEvalIndex).GetCell(7 + findex) == null) wsevalu.GetRow(rowEvalIndex).CreateCell(7 + findex);
-                                wsevalu.GetRow(rowEvalIndex).GetCell(7 + findex).SetCellValue(itemFoNo);
-                                wsevalu.GetRow(rowEvalIndex).GetCell(7 + findex).CellStyle = fontStyle;
+                                if (wsevalu.GetRow(rowEvalIndex).GetCell(8 + findex) == null) wsevalu.GetRow(rowEvalIndex).CreateCell(8 + findex);
+                                wsevalu.GetRow(rowEvalIndex).GetCell(8 + findex).SetCellValue(itemFoNo);
+                                wsevalu.GetRow(rowEvalIndex).GetCell(8 + findex).CellStyle = fontStyle;
                             }
                             else
                             {
@@ -2415,16 +2595,101 @@ namespace FineUIPro.Web.Evaluation
             }
             #endregion
 
+            #region 参与率
+            XSSFSheet participationRate = (XSSFSheet)hssfworkbook.GetSheet("参与率");
+
+            if (participationRateCount > 0)
+            {
+                var rowIndex = 1;
+                foreach (var vs in participationRateReport)
+                {
+                    if (participationRate.GetRow(rowIndex) == null) participationRate.CreateRow(rowIndex);
+                    //报告日期	
+                    if (participationRate.GetRow(rowIndex).GetCell(0) == null) participationRate.GetRow(rowIndex).CreateCell(0);
+                    participationRate.GetRow(rowIndex).GetCell(0).SetCellValue(vs.ReportMonth);
+                    participationRate.GetRow(rowIndex).GetCell(0).CellStyle = fontStyle;
+                    //部门	
+                    if (participationRate.GetRow(rowIndex).GetCell(1) == null) participationRate.GetRow(rowIndex).CreateCell(1);
+                    participationRate.GetRow(rowIndex).GetCell(1).SetCellValue(vs.Depart);
+                    participationRate.GetRow(rowIndex).GetCell(1).CellStyle = fontStyle;
+                    //团队	
+                    if (participationRate.GetRow(rowIndex).GetCell(2) == null) participationRate.GetRow(rowIndex).CreateCell(2);
+                    participationRate.GetRow(rowIndex).GetCell(2).SetCellValue(vs.Team);
+                    participationRate.GetRow(rowIndex).GetCell(2).CellStyle = fontStyle;
+                    //参与率	
+                    if (participationRate.GetRow(rowIndex).GetCell(3) == null) participationRate.GetRow(rowIndex).CreateCell(3);
+                    participationRate.GetRow(rowIndex).GetCell(3).SetCellValue(vs.Participation_Rate != null ? (vs.Participation_Rate * 100).ToString() + "%" : "0");
+                    participationRate.GetRow(rowIndex).GetCell(3).CellStyle = styleQfw;
+                    //参与率类型
+                    if (participationRate.GetRow(rowIndex).GetCell(4) == null) participationRate.GetRow(rowIndex).CreateCell(4);
+                    participationRate.GetRow(rowIndex).GetCell(4).SetCellValue(vs.Participation_Rate_Type);
+                    participationRate.GetRow(rowIndex).GetCell(4).CellStyle = fontStyle;
+                    //合同类型
+                    if (participationRate.GetRow(rowIndex).GetCell(5) == null) participationRate.GetRow(rowIndex).CreateCell(5);
+                    participationRate.GetRow(rowIndex).GetCell(5).SetCellValue(vs.IsSafe == true ? "安全" : "常规");
+                    participationRate.GetRow(rowIndex).GetCell(5).CellStyle = fontStyle;
+
+                    if ((int)((90 * (rowIndex + punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUserCount)) / totalNum) > percent)
+                    {
+                        percent = (int)(100 * (rowIndex + punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUserCount) / totalNum);
+                    }
+                    rowIndex++;
+                }
+            }
+
+            #endregion
+
+            #region 合同结算金额
+            XSSFSheet settlement = (XSSFSheet)hssfworkbook.GetSheet("合同结算金额");
+            if (sesReportCount > 0)
+            {
+                var rowSesIndex = 1;
+                foreach (var item in sesReportList)
+                {
+                    if (settlement.GetRow(rowSesIndex) == null) settlement.CreateRow(rowSesIndex);
+                    #region 列赋值
+                    //合同号
+                    if (settlement.GetRow(rowSesIndex).GetCell(0) == null) settlement.GetRow(rowSesIndex).CreateCell(0);
+                    settlement.GetRow(rowSesIndex).GetCell(0).SetCellValue(item.FO);
+                    settlement.GetRow(rowSesIndex).GetCell(0).CellStyle = fontStyle;
+                    //工单号
+                    if (settlement.GetRow(rowSesIndex).GetCell(1) == null) settlement.GetRow(rowSesIndex).CreateCell(1);
+                    settlement.GetRow(rowSesIndex).GetCell(1).SetCellValue(item.SES_No);
+                    settlement.GetRow(rowSesIndex).GetCell(1).CellStyle = fontStyle;
+                    //工单预算金额
+                    if (settlement.GetRow(rowSesIndex).GetCell(2) == null) settlement.GetRow(rowSesIndex).CreateCell(2);
+                    settlement.GetRow(rowSesIndex).GetCell(2).SetCellValue(item.SSR_budget.HasValue ? item.SSR_budget.Value.ToString("#.0") : "");
+                    settlement.GetRow(rowSesIndex).GetCell(2).CellStyle = fontStyle;
+                    //工单结算金额
+                    if (settlement.GetRow(rowSesIndex).GetCell(3) == null) settlement.GetRow(rowSesIndex).CreateCell(3);
+                    settlement.GetRow(rowSesIndex).GetCell(3).SetCellValue(item.SSR_Actual_cost.HasValue ? item.SSR_Actual_cost.Value.ToString("#.0") : "");
+                    settlement.GetRow(rowSesIndex).GetCell(3).CellStyle = fontStyle;
+                    //工单结算时间
+                    if (settlement.GetRow(rowSesIndex).GetCell(4) == null) settlement.GetRow(rowSesIndex).CreateCell(4);
+                    settlement.GetRow(rowSesIndex).GetCell(4).SetCellValue(item.SES_Confirmed_on.HasValue ? string.Format("{0:yyyy-MM}", item.SES_Confirmed_on) : "");
+                    settlement.GetRow(rowSesIndex).GetCell(4).CellStyle = fontStyle;
+                    #endregion
+                    if ((int)((90 * (rowSesIndex + punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount+ noEvaluatedUserCount+ participationRateCount)) / totalNum) > percent)
+                    {
+                        percent = (int)(100 * (rowSesIndex + punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUserCount + participationRateCount) / totalNum);
+                    }
+                    rowSesIndex++;
+                }
+            }
+            #endregion
+
             ws.ForceFormulaRecalculation = true;
             //ws4.ForceFormulaRecalculation = true;
             wsCm.ForceFormulaRecalculation = true;
             wss.ForceFormulaRecalculation = true;
             wssafe.ForceFormulaRecalculation = true;
             wsevalu.ForceFormulaRecalculation = true;
+            participationRate.ForceFormulaRecalculation = true;
+            settlement.ForceFormulaRecalculation = true;
 
             //using (FileStream filess = File.OpenWrite(ReportFileName))
             //{
-                //hssfworkbook.Write(filess);
+            //hssfworkbook.Write(filess);
             //filess.Flush();
             //filess.Close();
             //}
@@ -2440,15 +2705,41 @@ namespace FineUIPro.Web.Evaluation
 
             #endregion
         }
+        #endregion
 
-        private void ExportEN(List<Model.View_EMC_Punishment> punishList, List<Model.View_FC_ContractManagement> cmList, List<Model.View_FC_Contractor> conList, List<Model.FC_OverviewReport> OverviewReport, List<Model.FC_OverviewReport> safeOverviewReport, List<Model.FC_NoEvaluatedUser> noEvaluatedUser)
+        #region 导出英文版
+        /// <summary>
+        /// 导出英文版
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnExportEN_Click(object sender, EventArgs e)
+        {
+            percent = 0;
+            url = "";
+            List<Model.View_EMC_Punishment> punishList = (from x in Funs.DB.View_EMC_Punishment where x.Flag == "1" select x).ToList();
+            List<Model.View_FC_ContractManagement> cmList = (from x in Funs.DB.View_FC_ContractManagement where x.IsExport == true orderby x.FO_NO, x.FileType select x).ToList();
+            List<Model.View_FC_Contractor> conList = (from x in Funs.DB.View_FC_Contractor where x.FC_Status == "Valid" || x.FC_Status == "Expired Soon" orderby x.Contractor, x.Expire_Date select x).ToList();
+            List<Model.FC_OverviewReport> overviewReport = (from x in Funs.DB.FC_OverviewReport where x.IsSafe == false orderby x.ReportMonth, x.FO_NO select x).ToList();
+            List<Model.FC_OverviewReport> safeOverviewReport = (from x in Funs.DB.FC_OverviewReport where x.IsSafe == true orderby x.ReportMonth, x.FO_NO select x).ToList();
+            List<Model.FC_NoEvaluatedUser> noEvaluatedUser = (from x in Funs.DB.FC_NoEvaluatedUser orderby x.ReportMonth, x.IsSafe select x).ToList();
+            List<Model.FC_BigDepartEvaRate> participationRateReport = (from x in Funs.DB.FC_BigDepartEvaRate orderby x.ReportMonth, x.Team select x).ToList();
+            List<Model.FC_SESReport> sesReportList = (from x in Funs.DB.FC_SESReport where x.Accepted != "" && x.Accepted != null select x).ToList();
+
+            Thread t = new Thread(new ThreadStart(() => { ExportEN(punishList, cmList, conList, overviewReport, safeOverviewReport, noEvaluatedUser, participationRateReport, sesReportList); }));
+            t.Start();
+            PageContext.RegisterStartupScript("showProcessBar()");
+        }
+        private void ExportEN(List<Model.View_EMC_Punishment> punishList, List<Model.View_FC_ContractManagement> cmList, List<Model.View_FC_Contractor> conList, List<Model.FC_OverviewReport> OverviewReport, List<Model.FC_OverviewReport> safeOverviewReport, List<Model.FC_NoEvaluatedUser> noEvaluatedUser,List<Model.FC_BigDepartEvaRate> participationRateReport, List<Model.FC_SESReport> sesReportList)
         {
             int punishCount = punishList.Count();
             int cmListCount = cmList.Count();
             int conListCount = conList.Count();
             int overviewCount = OverviewReport.Count;
             int safeOverviewCount = safeOverviewReport.Count;
-            int totalNum = punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUser.Count;
+            int participationRateCount = participationRateReport.Count;
+            int sesReportCount = sesReportList.Count();
+            int totalNum = punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUser.Count + participationRateCount + sesReportCount;
             #region
             string rootPath = Server.MapPath("~/") + Const.ExcelUrl;
             //模板文件
@@ -2550,35 +2841,37 @@ namespace FineUIPro.Web.Evaluation
                     if (ws.GetRow(rowIndex).GetCell(9) == null) ws.GetRow(rowIndex).CreateCell(9);
                     ws.GetRow(rowIndex).GetCell(9).SetCellValue(p.ContractorEn);
                     if (ws.GetRow(rowIndex).GetCell(10) == null) ws.GetRow(rowIndex).CreateCell(10);
-                    ws.GetRow(rowIndex).GetCell(10).SetCellValue(p.Location);
+                    ws.GetRow(rowIndex).GetCell(10).SetCellValue(p.ContractorShortName);
                     if (ws.GetRow(rowIndex).GetCell(11) == null) ws.GetRow(rowIndex).CreateCell(11);
-                    ws.GetRow(rowIndex).GetCell(11).SetCellValue(p.Description);
+                    ws.GetRow(rowIndex).GetCell(11).SetCellValue(p.Location);
                     if (ws.GetRow(rowIndex).GetCell(12) == null) ws.GetRow(rowIndex).CreateCell(12);
-                    ws.GetRow(rowIndex).GetCell(12).SetCellValue(p.Company != null ? p.Company.Value.ToString("0.00") : "");
+                    ws.GetRow(rowIndex).GetCell(12).SetCellValue(p.Description);
                     if (ws.GetRow(rowIndex).GetCell(13) == null) ws.GetRow(rowIndex).CreateCell(13);
-                    ws.GetRow(rowIndex).GetCell(13).SetCellValue(p.Individual != null ? p.Individual.Value.ToString("0.00") : "");
+                    ws.GetRow(rowIndex).GetCell(13).SetCellValue(p.Company != null ? p.Company.Value.ToString("0.00") : "");
                     if (ws.GetRow(rowIndex).GetCell(14) == null) ws.GetRow(rowIndex).CreateCell(14);
-                    ws.GetRow(rowIndex).GetCell(14).SetCellValue(p.Backcharge != null ? p.Backcharge.Value.ToString("0.00") : "");
+                    ws.GetRow(rowIndex).GetCell(14).SetCellValue(p.Individual != null ? p.Individual.Value.ToString("0.00") : "");
                     if (ws.GetRow(rowIndex).GetCell(15) == null) ws.GetRow(rowIndex).CreateCell(15);
-                    ws.GetRow(rowIndex).GetCell(15).SetCellValue(p.ViolationDegree);
+                    ws.GetRow(rowIndex).GetCell(15).SetCellValue(p.Backcharge != null ? p.Backcharge.Value.ToString("0.00") : "");
                     if (ws.GetRow(rowIndex).GetCell(16) == null) ws.GetRow(rowIndex).CreateCell(16);
-                    ws.GetRow(rowIndex).GetCell(16).SetCellValue(p.Contract_Admin);
+                    ws.GetRow(rowIndex).GetCell(16).SetCellValue(p.ViolationDegree);
                     if (ws.GetRow(rowIndex).GetCell(17) == null) ws.GetRow(rowIndex).CreateCell(17);
-                    ws.GetRow(rowIndex).GetCell(17).SetCellValue(p.Main_Coordinator);
+                    ws.GetRow(rowIndex).GetCell(17).SetCellValue(p.Contract_Admin);
                     if (ws.GetRow(rowIndex).GetCell(18) == null) ws.GetRow(rowIndex).CreateCell(18);
-                    ws.GetRow(rowIndex).GetCell(18).SetCellValue(p.MCDept);
+                    ws.GetRow(rowIndex).GetCell(18).SetCellValue(p.Main_Coordinator);
                     if (ws.GetRow(rowIndex).GetCell(19) == null) ws.GetRow(rowIndex).CreateCell(19);
-                    ws.GetRow(rowIndex).GetCell(19).SetCellValue(p.User_Representative);
+                    ws.GetRow(rowIndex).GetCell(19).SetCellValue(p.MCDept);
                     if (ws.GetRow(rowIndex).GetCell(20) == null) ws.GetRow(rowIndex).CreateCell(20);
-                    ws.GetRow(rowIndex).GetCell(20).SetCellValue(p.BYCRU);
+                    ws.GetRow(rowIndex).GetCell(20).SetCellValue(p.User_Representative);
                     if (ws.GetRow(rowIndex).GetCell(21) == null) ws.GetRow(rowIndex).CreateCell(21);
-                    ws.GetRow(rowIndex).GetCell(21).SetCellValue(p.Violation_Inspector_Name);
+                    ws.GetRow(rowIndex).GetCell(21).SetCellValue(p.BYCRU);
                     if (ws.GetRow(rowIndex).GetCell(22) == null) ws.GetRow(rowIndex).CreateCell(22);
-                    ws.GetRow(rowIndex).GetCell(22).SetCellValue(p.InspectionDep);
+                    ws.GetRow(rowIndex).GetCell(22).SetCellValue(p.Violation_Inspector_Name);
                     if (ws.GetRow(rowIndex).GetCell(23) == null) ws.GetRow(rowIndex).CreateCell(23);
-                    ws.GetRow(rowIndex).GetCell(23).SetCellValue(p.SES_No);
+                    ws.GetRow(rowIndex).GetCell(23).SetCellValue(p.InspectionDep);
                     if (ws.GetRow(rowIndex).GetCell(24) == null) ws.GetRow(rowIndex).CreateCell(24);
-                    ws.GetRow(rowIndex).GetCell(24).SetCellValue(p.CompletionDate != null ? p.CompletionDate.Value.ToString("yyyy/MM/dd") : "");
+                    ws.GetRow(rowIndex).GetCell(24).SetCellValue(p.SES_No);
+                    if (ws.GetRow(rowIndex).GetCell(25) == null) ws.GetRow(rowIndex).CreateCell(25);
+                    ws.GetRow(rowIndex).GetCell(25).SetCellValue(p.CompletionDate != null ? p.CompletionDate.Value.ToString("yyyy/MM/dd") : "");
 
                     if ((int)(90 * (rowIndex) / totalNum) > percent)
                     {
@@ -2688,19 +2981,21 @@ namespace FineUIPro.Web.Evaluation
                     if (wsCm.GetRow(rowIndex).GetCell(7) == null) wsCm.GetRow(rowIndex).CreateCell(7);
                     wsCm.GetRow(rowIndex).GetCell(7).SetCellValue(p.ContractorEn);
                     if (wsCm.GetRow(rowIndex).GetCell(8) == null) wsCm.GetRow(rowIndex).CreateCell(8);
-                    wsCm.GetRow(rowIndex).GetCell(8).SetCellValue(p.Remark);
+                    wsCm.GetRow(rowIndex).GetCell(8).SetCellValue(p.ContractorShortName);
                     if (wsCm.GetRow(rowIndex).GetCell(9) == null) wsCm.GetRow(rowIndex).CreateCell(9);
-                    wsCm.GetRow(rowIndex).GetCell(9).SetCellValue(p.FileType);
+                    wsCm.GetRow(rowIndex).GetCell(9).SetCellValue(p.Remark);
                     if (wsCm.GetRow(rowIndex).GetCell(10) == null) wsCm.GetRow(rowIndex).CreateCell(10);
-                    wsCm.GetRow(rowIndex).GetCell(10).SetCellValue(p.Contract_Admin);
+                    wsCm.GetRow(rowIndex).GetCell(10).SetCellValue(p.FileType);
                     if (wsCm.GetRow(rowIndex).GetCell(11) == null) wsCm.GetRow(rowIndex).CreateCell(11);
-                    wsCm.GetRow(rowIndex).GetCell(11).SetCellValue(p.Main_Coordinator);
+                    wsCm.GetRow(rowIndex).GetCell(11).SetCellValue(p.Contract_Admin);
                     if (wsCm.GetRow(rowIndex).GetCell(12) == null) wsCm.GetRow(rowIndex).CreateCell(12);
-                    wsCm.GetRow(rowIndex).GetCell(12).SetCellValue(p.MCDept);
+                    wsCm.GetRow(rowIndex).GetCell(12).SetCellValue(p.Main_Coordinator);
                     if (wsCm.GetRow(rowIndex).GetCell(13) == null) wsCm.GetRow(rowIndex).CreateCell(13);
-                    wsCm.GetRow(rowIndex).GetCell(13).SetCellValue(p.User_Representative);
+                    wsCm.GetRow(rowIndex).GetCell(13).SetCellValue(p.MCDept);
                     if (wsCm.GetRow(rowIndex).GetCell(14) == null) wsCm.GetRow(rowIndex).CreateCell(14);
-                    wsCm.GetRow(rowIndex).GetCell(14).SetCellValue(p.BycDept);
+                    wsCm.GetRow(rowIndex).GetCell(14).SetCellValue(p.User_Representative);
+                    if (wsCm.GetRow(rowIndex).GetCell(15) == null) wsCm.GetRow(rowIndex).CreateCell(15);
+                    wsCm.GetRow(rowIndex).GetCell(15).SetCellValue(p.BycDept);
 
                     if ((int)((90 * (rowIndex + punishCount)) / totalNum) > percent)
                     {
@@ -2719,14 +3014,27 @@ namespace FineUIPro.Web.Evaluation
                 foreach (var p in conList)
                 {
                     if (wsCon.GetRow(rowIndex) == null) wsCon.CreateRow(rowIndex);
+                    //专业
                     if (wsCon.GetRow(rowIndex).GetCell(0) == null) wsCon.GetRow(rowIndex).CreateCell(0);
-                    wsCon.GetRow(rowIndex).GetCell(0).SetCellValue(p.Contractor);
+                    wsCon.GetRow(rowIndex).GetCell(0).SetCellValue(p.Discipline);
+                    //承包商
                     if (wsCon.GetRow(rowIndex).GetCell(1) == null) wsCon.GetRow(rowIndex).CreateCell(1);
-                    wsCon.GetRow(rowIndex).GetCell(1).SetCellValue(p.FO_NO);
+                    wsCon.GetRow(rowIndex).GetCell(1).SetCellValue(p.Contractor);
+                    //承包商（简称）
                     if (wsCon.GetRow(rowIndex).GetCell(2) == null) wsCon.GetRow(rowIndex).CreateCell(2);
-                    wsCon.GetRow(rowIndex).GetCell(2).SetCellValue(p.FC_Status);
+                    wsCon.GetRow(rowIndex).GetCell(2).SetCellValue(p.ContractorShortName);
+                    //合同号
                     if (wsCon.GetRow(rowIndex).GetCell(3) == null) wsCon.GetRow(rowIndex).CreateCell(3);
-                    wsCon.GetRow(rowIndex).GetCell(3).SetCellValue(p.Expire_Date != null ? p.Expire_Date.Value.ToString("yyyy/MM/dd") : "");
+                    wsCon.GetRow(rowIndex).GetCell(3).SetCellValue(p.FO_NO);
+                    //合同状态
+                    if (wsCon.GetRow(rowIndex).GetCell(4) == null) wsCon.GetRow(rowIndex).CreateCell(4);
+                    wsCon.GetRow(rowIndex).GetCell(4).SetCellValue(p.FC_Status);
+                    //生效时间
+                    if (wsCon.GetRow(rowIndex).GetCell(5) == null) wsCon.GetRow(rowIndex).CreateCell(5);
+                    wsCon.GetRow(rowIndex).GetCell(5).SetCellValue(p.Validate_Date != null ? p.Validate_Date.Value.ToString("yyyy/MM/dd") : "");
+                    //到期时间
+                    if (wsCon.GetRow(rowIndex).GetCell(6) == null) wsCon.GetRow(rowIndex).CreateCell(6);
+                    wsCon.GetRow(rowIndex).GetCell(6).SetCellValue(p.Expire_Date != null ? p.Expire_Date.Value.ToString("yyyy/MM/dd") : "");
 
                     if ((int)((90 * (rowIndex + punishCount  + cmListCount)) / totalNum) > percent)
                     {
@@ -2763,78 +3071,90 @@ namespace FineUIPro.Web.Evaluation
                     wss.GetRow(rowIndex).GetCell(3).CellStyle = fontStyle;
 
                     if (wss.GetRow(rowIndex).GetCell(4) == null) wss.GetRow(rowIndex).CreateCell(4);
-                    wss.GetRow(rowIndex).GetCell(4).SetCellValue(vs.Main_Coordinator);
-                    wss.GetRow(rowIndex).GetCell(4).CellStyle = styleQfw1;
+                    wss.GetRow(rowIndex).GetCell(4).SetCellValue(vs.ContractorCN);
+                    wss.GetRow(rowIndex).GetCell(4).CellStyle = fontStyle;
 
                     if (wss.GetRow(rowIndex).GetCell(5) == null) wss.GetRow(rowIndex).CreateCell(5);
-                    wss.GetRow(rowIndex).GetCell(5).SetCellValue(vs.Total != null ? float.Parse(vs.Total.ToString()) : 0);
-                    wss.GetRow(rowIndex).GetCell(5).CellStyle = rateStyle;
+                    wss.GetRow(rowIndex).GetCell(5).SetCellValue(vs.ContractorEN);
+                    wss.GetRow(rowIndex).GetCell(5).CellStyle = fontStyle;
 
                     if (wss.GetRow(rowIndex).GetCell(6) == null) wss.GetRow(rowIndex).CreateCell(6);
-                    wss.GetRow(rowIndex).GetCell(6).SetCellValue(vs.Participation_Rate != null ? vs.Participation_Rate.ToString() + "%" : "0");
-                    wss.GetRow(rowIndex).GetCell(6).CellStyle = styleQfw;
+                    wss.GetRow(rowIndex).GetCell(6).SetCellValue(vs.ContractorShortName);
+                    wss.GetRow(rowIndex).GetCell(6).CellStyle = fontStyle;
 
                     if (wss.GetRow(rowIndex).GetCell(7) == null) wss.GetRow(rowIndex).CreateCell(7);
-                    wss.GetRow(rowIndex).GetCell(7).SetCellValue(vs.TotalAvgScore1 != null ? vs.TotalAvgScore1.ToString() : "");
-                    wss.GetRow(rowIndex).GetCell(7).CellStyle = styleQfw;
+                    wss.GetRow(rowIndex).GetCell(7).SetCellValue(vs.Main_Coordinator);
+                    wss.GetRow(rowIndex).GetCell(7).CellStyle = styleQfw1;
 
                     if (wss.GetRow(rowIndex).GetCell(8) == null) wss.GetRow(rowIndex).CreateCell(8);
-                    wss.GetRow(rowIndex).GetCell(8).SetCellValue(vs.TotalAvgScore2 != null ? vs.TotalAvgScore2.ToString() : "");
-                    wss.GetRow(rowIndex).GetCell(8).CellStyle = styleQfw;
+                    wss.GetRow(rowIndex).GetCell(8).SetCellValue(vs.Total != null ? float.Parse(vs.Total.ToString()) : 0);
+                    wss.GetRow(rowIndex).GetCell(8).CellStyle = rateStyle;
 
                     if (wss.GetRow(rowIndex).GetCell(9) == null) wss.GetRow(rowIndex).CreateCell(9);
-                    wss.GetRow(rowIndex).GetCell(9).SetCellValue(vs.TotalAvgScore3 != null ? vs.TotalAvgScore3.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(9).SetCellValue(vs.Participation_Rate != null ? vs.Participation_Rate.ToString() + "%" : "0");
                     wss.GetRow(rowIndex).GetCell(9).CellStyle = styleQfw;
 
                     if (wss.GetRow(rowIndex).GetCell(10) == null) wss.GetRow(rowIndex).CreateCell(10);
-                    wss.GetRow(rowIndex).GetCell(10).SetCellValue(vs.CTSSAvgScore != null ? vs.CTSSAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(10).SetCellValue(vs.TotalAvgScore1 != null ? vs.TotalAvgScore1.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(10).CellStyle = styleQfw;
 
                     if (wss.GetRow(rowIndex).GetCell(11) == null) wss.GetRow(rowIndex).CreateCell(11);
-                    wss.GetRow(rowIndex).GetCell(11).SetCellValue(vs.CTSCAvgScore != null ? vs.CTSCAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(11).SetCellValue(vs.TotalAvgScore2 != null ? vs.TotalAvgScore2.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(11).CellStyle = styleQfw;
 
                     if (wss.GetRow(rowIndex).GetCell(12) == null) wss.GetRow(rowIndex).CreateCell(12);
-                    decimal? tnum = (vs.TotalAvgScore3 != null ? vs.TotalAvgScore3 : 0) + (vs.CTSSAvgScore != null ? vs.CTSSAvgScore : 0) + (vs.CTSCAvgScore != null ? vs.CTSCAvgScore : 0);
-                    wss.GetRow(rowIndex).GetCell(12).SetCellValue(tnum != null && tnum != 0 ? tnum.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(12).SetCellValue(vs.TotalAvgScore3 != null ? vs.TotalAvgScore3.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(12).CellStyle = styleQfw;
 
                     if (wss.GetRow(rowIndex).GetCell(13) == null) wss.GetRow(rowIndex).CreateCell(13);
-                    wss.GetRow(rowIndex).GetCell(13).SetCellValue(vs.TotalAvgScore4 != null ? vs.TotalAvgScore4.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(13).SetCellValue(vs.CTSSAvgScore != null ? vs.CTSSAvgScore.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(13).CellStyle = styleQfw;
 
                     if (wss.GetRow(rowIndex).GetCell(14) == null) wss.GetRow(rowIndex).CreateCell(14);
-                    wss.GetRow(rowIndex).GetCell(14).SetCellValue(vs.TotalAvgScore5 != null ? vs.TotalAvgScore5.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(14).SetCellValue(vs.CTSCAvgScore != null ? vs.CTSCAvgScore.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(14).CellStyle = styleQfw;
 
                     if (wss.GetRow(rowIndex).GetCell(15) == null) wss.GetRow(rowIndex).CreateCell(15);
-                    wss.GetRow(rowIndex).GetCell(15).SetCellValue(vs.TotalAvgScore6 != null ? vs.TotalAvgScore6.ToString() : "");
+                    decimal? tnum = (vs.TotalAvgScore3 != null ? vs.TotalAvgScore3 : 0) + (vs.CTSSAvgScore != null ? vs.CTSSAvgScore : 0) + (vs.CTSCAvgScore != null ? vs.CTSCAvgScore : 0);
+                    wss.GetRow(rowIndex).GetCell(15).SetCellValue(tnum != null && tnum != 0 ? tnum.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(15).CellStyle = styleQfw;
 
                     if (wss.GetRow(rowIndex).GetCell(16) == null) wss.GetRow(rowIndex).CreateCell(16);
-                    wss.GetRow(rowIndex).GetCell(16).SetCellValue(vs.TimelyAvgSocre != null ? vs.TimelyAvgSocre.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(16).SetCellValue(vs.TotalAvgScore4 != null ? vs.TotalAvgScore4.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(16).CellStyle = styleQfw;
 
                     if (wss.GetRow(rowIndex).GetCell(17) == null) wss.GetRow(rowIndex).CreateCell(17);
-                    wss.GetRow(rowIndex).GetCell(17).SetCellValue(vs.HonestyAvgScore != null ? vs.HonestyAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(17).SetCellValue(vs.TotalAvgScore5 != null ? vs.TotalAvgScore5.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(17).CellStyle = styleQfw;
 
                     if (wss.GetRow(rowIndex).GetCell(18) == null) wss.GetRow(rowIndex).CreateCell(18);
-                    wss.GetRow(rowIndex).GetCell(18).SetCellValue(vs.MainCoordinatorAvgScore != null ? vs.MainCoordinatorAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(18).SetCellValue(vs.TotalAvgScore6 != null ? vs.TotalAvgScore6.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(18).CellStyle = styleQfw;
 
                     if (wss.GetRow(rowIndex).GetCell(19) == null) wss.GetRow(rowIndex).CreateCell(19);
-                    wss.GetRow(rowIndex).GetCell(19).SetCellValue(vs.UserRepresentativeAvgScore != null ? vs.UserRepresentativeAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(19).SetCellValue(vs.TimelyAvgSocre != null ? vs.TimelyAvgSocre.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(19).CellStyle = styleQfw;
 
                     if (wss.GetRow(rowIndex).GetCell(20) == null) wss.GetRow(rowIndex).CreateCell(20);
-                    wss.GetRow(rowIndex).GetCell(20).SetCellValue(vs.CTSTAvgScore != null ? vs.CTSTAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(20).SetCellValue(vs.HonestyAvgScore != null ? vs.HonestyAvgScore.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(20).CellStyle = styleQfw;
 
                     if (wss.GetRow(rowIndex).GetCell(21) == null) wss.GetRow(rowIndex).CreateCell(21);
-                    wss.GetRow(rowIndex).GetCell(21).SetCellValue(vs.CTEDAvgScore != null ? vs.CTEDAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(21).SetCellValue(vs.MainCoordinatorAvgScore != null ? vs.MainCoordinatorAvgScore.ToString() : "");
                     wss.GetRow(rowIndex).GetCell(21).CellStyle = styleQfw;
 
+                    if (wss.GetRow(rowIndex).GetCell(22) == null) wss.GetRow(rowIndex).CreateCell(22);
+                    wss.GetRow(rowIndex).GetCell(22).SetCellValue(vs.UserRepresentativeAvgScore != null ? vs.UserRepresentativeAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(22).CellStyle = styleQfw;
+
+                    if (wss.GetRow(rowIndex).GetCell(23) == null) wss.GetRow(rowIndex).CreateCell(23);
+                    wss.GetRow(rowIndex).GetCell(23).SetCellValue(vs.CTSTAvgScore != null ? vs.CTSTAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(23).CellStyle = styleQfw;
+
+                    if (wss.GetRow(rowIndex).GetCell(24) == null) wss.GetRow(rowIndex).CreateCell(24);
+                    wss.GetRow(rowIndex).GetCell(24).SetCellValue(vs.CTEDAvgScore != null ? vs.CTEDAvgScore.ToString() : "");
+                    wss.GetRow(rowIndex).GetCell(24).CellStyle = styleQfw;
+
                     #endregion
                     if ((int)((90 * (rowIndex + punishCount + cmListCount + conListCount)) / totalNum) > percent)
                     {
@@ -2873,74 +3193,86 @@ namespace FineUIPro.Web.Evaluation
                     wssafe.GetRow(rowIndex).GetCell(3).CellStyle = fontStyle;
 
                     if (wssafe.GetRow(rowIndex).GetCell(4) == null) wssafe.GetRow(rowIndex).CreateCell(4);
-                    wssafe.GetRow(rowIndex).GetCell(4).SetCellValue(vs.Main_Coordinator);
-                    wssafe.GetRow(rowIndex).GetCell(4).CellStyle = styleQfw1;
+                    wssafe.GetRow(rowIndex).GetCell(4).SetCellValue(vs.ContractorCN);
+                    wssafe.GetRow(rowIndex).GetCell(4).CellStyle = fontStyle;
 
                     if (wssafe.GetRow(rowIndex).GetCell(5) == null) wssafe.GetRow(rowIndex).CreateCell(5);
-                    wssafe.GetRow(rowIndex).GetCell(5).SetCellValue(vs.Total != null ? float.Parse(vs.Total.ToString()) : 0);
-                    wssafe.GetRow(rowIndex).GetCell(5).CellStyle = rateStyle;
+                    wssafe.GetRow(rowIndex).GetCell(5).SetCellValue(vs.ContractorEN);
+                    wssafe.GetRow(rowIndex).GetCell(5).CellStyle = fontStyle;
 
                     if (wssafe.GetRow(rowIndex).GetCell(6) == null) wssafe.GetRow(rowIndex).CreateCell(6);
-                    wssafe.GetRow(rowIndex).GetCell(6).SetCellValue(vs.Participation_Rate != null ? vs.Participation_Rate.ToString() + "%" : "0");
-                    wssafe.GetRow(rowIndex).GetCell(6).CellStyle = styleQfw;
+                    wssafe.GetRow(rowIndex).GetCell(6).SetCellValue(vs.ContractorShortName);
+                    wssafe.GetRow(rowIndex).GetCell(6).CellStyle = fontStyle;
 
                     if (wssafe.GetRow(rowIndex).GetCell(7) == null) wssafe.GetRow(rowIndex).CreateCell(7);
-                    wssafe.GetRow(rowIndex).GetCell(7).SetCellValue(vs.TotalAvgScore1 != null ? vs.TotalAvgScore1.ToString() : "");
-                    wssafe.GetRow(rowIndex).GetCell(7).CellStyle = styleQfw;
+                    wssafe.GetRow(rowIndex).GetCell(7).SetCellValue(vs.Main_Coordinator);
+                    wssafe.GetRow(rowIndex).GetCell(7).CellStyle = styleQfw1;
 
                     if (wssafe.GetRow(rowIndex).GetCell(8) == null) wssafe.GetRow(rowIndex).CreateCell(8);
-                    wssafe.GetRow(rowIndex).GetCell(8).SetCellValue(vs.TotalAvgScore2 != null ? vs.TotalAvgScore2.ToString() : "");
-                    wssafe.GetRow(rowIndex).GetCell(8).CellStyle = styleQfw;
+                    wssafe.GetRow(rowIndex).GetCell(8).SetCellValue(vs.Total != null ? float.Parse(vs.Total.ToString()) : 0);
+                    wssafe.GetRow(rowIndex).GetCell(8).CellStyle = rateStyle;
 
                     if (wssafe.GetRow(rowIndex).GetCell(9) == null) wssafe.GetRow(rowIndex).CreateCell(9);
-                    wssafe.GetRow(rowIndex).GetCell(9).SetCellValue(vs.TotalAvgScore3 != null ? vs.TotalAvgScore3.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(9).SetCellValue(vs.Participation_Rate != null ? vs.Participation_Rate.ToString() + "%" : "0");
                     wssafe.GetRow(rowIndex).GetCell(9).CellStyle = styleQfw;
 
                     if (wssafe.GetRow(rowIndex).GetCell(10) == null) wssafe.GetRow(rowIndex).CreateCell(10);
-                    wssafe.GetRow(rowIndex).GetCell(10).SetCellValue(vs.CTSSAvgScore != null ? vs.CTSSAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(10).SetCellValue(vs.TotalAvgScore1 != null ? vs.TotalAvgScore1.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(10).CellStyle = styleQfw;
 
                     if (wssafe.GetRow(rowIndex).GetCell(11) == null) wssafe.GetRow(rowIndex).CreateCell(11);
-                    wssafe.GetRow(rowIndex).GetCell(11).SetCellValue(vs.CTSCAvgScore != null ? vs.CTSCAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(11).SetCellValue(vs.TotalAvgScore2 != null ? vs.TotalAvgScore2.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(11).CellStyle = styleQfw;
 
                     if (wssafe.GetRow(rowIndex).GetCell(12) == null) wssafe.GetRow(rowIndex).CreateCell(12);
-                    decimal? tnum = (vs.TotalAvgScore3 != null ? vs.TotalAvgScore3 : 0) + (vs.CTSSAvgScore != null ? vs.CTSSAvgScore : 0) + (vs.CTSCAvgScore != null ? vs.CTSCAvgScore : 0);
-                    wssafe.GetRow(rowIndex).GetCell(12).SetCellValue(tnum != null && tnum != 0 ? tnum.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(12).SetCellValue(vs.TotalAvgScore3 != null ? vs.TotalAvgScore3.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(12).CellStyle = styleQfw;
 
                     if (wssafe.GetRow(rowIndex).GetCell(13) == null) wssafe.GetRow(rowIndex).CreateCell(13);
-                    wssafe.GetRow(rowIndex).GetCell(13).SetCellValue(vs.TotalAvgScore5 != null ? vs.TotalAvgScore5.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(13).SetCellValue(vs.CTSSAvgScore != null ? vs.CTSSAvgScore.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(13).CellStyle = styleQfw;
 
                     if (wssafe.GetRow(rowIndex).GetCell(14) == null) wssafe.GetRow(rowIndex).CreateCell(14);
-                    wssafe.GetRow(rowIndex).GetCell(14).SetCellValue(vs.TotalAvgScore6 != null ? vs.TotalAvgScore6.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(14).SetCellValue(vs.CTSCAvgScore != null ? vs.CTSCAvgScore.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(14).CellStyle = styleQfw;
 
                     if (wssafe.GetRow(rowIndex).GetCell(15) == null) wssafe.GetRow(rowIndex).CreateCell(15);
-                    wssafe.GetRow(rowIndex).GetCell(15).SetCellValue(vs.TimelyAvgSocre != null ? vs.TimelyAvgSocre.ToString() : "");
+                    decimal? tnum = (vs.TotalAvgScore3 != null ? vs.TotalAvgScore3 : 0) + (vs.CTSSAvgScore != null ? vs.CTSSAvgScore : 0) + (vs.CTSCAvgScore != null ? vs.CTSCAvgScore : 0);
+                    wssafe.GetRow(rowIndex).GetCell(15).SetCellValue(tnum != null && tnum != 0 ? tnum.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(15).CellStyle = styleQfw;
 
                     if (wssafe.GetRow(rowIndex).GetCell(16) == null) wssafe.GetRow(rowIndex).CreateCell(16);
-                    wssafe.GetRow(rowIndex).GetCell(16).SetCellValue(vs.HonestyAvgScore != null ? vs.HonestyAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(16).SetCellValue(vs.TotalAvgScore5 != null ? vs.TotalAvgScore5.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(16).CellStyle = styleQfw;
 
                     if (wssafe.GetRow(rowIndex).GetCell(17) == null) wssafe.GetRow(rowIndex).CreateCell(17);
-                    wssafe.GetRow(rowIndex).GetCell(17).SetCellValue(vs.MainCoordinatorAvgScore != null ? vs.MainCoordinatorAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(17).SetCellValue(vs.TotalAvgScore6 != null ? vs.TotalAvgScore6.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(17).CellStyle = styleQfw;
 
                     if (wssafe.GetRow(rowIndex).GetCell(18) == null) wssafe.GetRow(rowIndex).CreateCell(18);
-                    wssafe.GetRow(rowIndex).GetCell(18).SetCellValue(vs.UserRepresentativeAvgScore != null ? vs.UserRepresentativeAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(18).SetCellValue(vs.TimelyAvgSocre != null ? vs.TimelyAvgSocre.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(18).CellStyle = styleQfw;
 
                     if (wssafe.GetRow(rowIndex).GetCell(19) == null) wssafe.GetRow(rowIndex).CreateCell(19);
-                    wssafe.GetRow(rowIndex).GetCell(19).SetCellValue(vs.CTSTAvgScore != null ? vs.CTSTAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(19).SetCellValue(vs.HonestyAvgScore != null ? vs.HonestyAvgScore.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(19).CellStyle = styleQfw;
 
                     if (wssafe.GetRow(rowIndex).GetCell(20) == null) wssafe.GetRow(rowIndex).CreateCell(20);
-                    wssafe.GetRow(rowIndex).GetCell(20).SetCellValue(vs.CTEDAvgScore != null ? vs.CTEDAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(20).SetCellValue(vs.MainCoordinatorAvgScore != null ? vs.MainCoordinatorAvgScore.ToString() : "");
                     wssafe.GetRow(rowIndex).GetCell(20).CellStyle = styleQfw;
 
+                    if (wssafe.GetRow(rowIndex).GetCell(21) == null) wssafe.GetRow(rowIndex).CreateCell(21);
+                    wssafe.GetRow(rowIndex).GetCell(21).SetCellValue(vs.UserRepresentativeAvgScore != null ? vs.UserRepresentativeAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(21).CellStyle = styleQfw;
+
+                    if (wssafe.GetRow(rowIndex).GetCell(22) == null) wssafe.GetRow(rowIndex).CreateCell(22);
+                    wssafe.GetRow(rowIndex).GetCell(22).SetCellValue(vs.CTSTAvgScore != null ? vs.CTSTAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(22).CellStyle = styleQfw;
+
+                    if (wssafe.GetRow(rowIndex).GetCell(23) == null) wssafe.GetRow(rowIndex).CreateCell(23);
+                    wssafe.GetRow(rowIndex).GetCell(23).SetCellValue(vs.CTEDAvgScore != null ? vs.CTEDAvgScore.ToString() : "");
+                    wssafe.GetRow(rowIndex).GetCell(23).CellStyle = styleQfw;
+
                     #endregion
                     if ((int)((90 * (rowIndex + punishCount + cmListCount + conListCount + overviewCount)) / totalNum) > percent)
                     {
@@ -2981,8 +3313,11 @@ namespace FineUIPro.Web.Evaluation
                     wsevalu.GetRow(rowEvalIndex).GetCell(5).SetCellValue(item.RoleName);
                     wsevalu.GetRow(rowEvalIndex).GetCell(5).CellStyle = fontStyle;
                     if (wsevalu.GetRow(rowEvalIndex).GetCell(6) == null) wsevalu.GetRow(rowEvalIndex).CreateCell(6);
-                    wsevalu.GetRow(rowEvalIndex).GetCell(6).SetCellValue(item.DepartName);
+                    wsevalu.GetRow(rowEvalIndex).GetCell(6).SetCellValue(item.DepartName.Substring(0, item.DepartName.LastIndexOf("/")));
                     wsevalu.GetRow(rowEvalIndex).GetCell(6).CellStyle = fontStyle;
+                    if (wsevalu.GetRow(rowEvalIndex).GetCell(7) == null) wsevalu.GetRow(rowEvalIndex).CreateCell(7);
+                    wsevalu.GetRow(rowEvalIndex).GetCell(7).SetCellValue(item.DepartName);
+                    wsevalu.GetRow(rowEvalIndex).GetCell(7).CellStyle = fontStyle;
                     //if (wsevalu.GetRow(rowEvalIndex).GetCell(6) == null) wsevalu.GetRow(rowEvalIndex).CreateCell(6);
                     //wsevalu.GetRow(rowEvalIndex).GetCell(6).SetCellValue(item.NotEvaluatedFoNo);
                     //wsevalu.GetRow(rowEvalIndex).GetCell(6).CellStyle = fontStyle;
@@ -2994,13 +3329,13 @@ namespace FineUIPro.Web.Evaluation
                         {
                             if (findex < 250)
                             {
-                                if (wsevalu.GetRow(0).GetCell(7 + findex) == null) wsevalu.GetRow(0).CreateCell(7 + findex);
-                                wsevalu.GetRow(0).GetCell(7 + findex).SetCellValue("Contract No. \r\nNot Evaluated" + (findex + 1).ToString());
-                                wsevalu.GetRow(0).GetCell(7 + findex).CellStyle = wsevalu.GetRow(0).GetCell(7).CellStyle;
+                                if (wsevalu.GetRow(0).GetCell(8 + findex) == null) wsevalu.GetRow(0).CreateCell(8 + findex);
+                                wsevalu.GetRow(0).GetCell(8 + findex).SetCellValue("Contract No. \r\nNot Evaluated" + (findex + 1).ToString());
+                                wsevalu.GetRow(0).GetCell(8 + findex).CellStyle = wsevalu.GetRow(0).GetCell(8).CellStyle;
 
-                                if (wsevalu.GetRow(rowEvalIndex).GetCell(7 + findex) == null) wsevalu.GetRow(rowEvalIndex).CreateCell(7 + findex);
-                                wsevalu.GetRow(rowEvalIndex).GetCell(7 + findex).SetCellValue(itemFoNo);
-                                wsevalu.GetRow(rowEvalIndex).GetCell(7 + findex).CellStyle = fontStyle;
+                                if (wsevalu.GetRow(rowEvalIndex).GetCell(8 + findex) == null) wsevalu.GetRow(rowEvalIndex).CreateCell(8 + findex);
+                                wsevalu.GetRow(rowEvalIndex).GetCell(8 + findex).SetCellValue(itemFoNo);
+                                wsevalu.GetRow(rowEvalIndex).GetCell(8 + findex).CellStyle = fontStyle;
                             }
                             else
                             {
@@ -3025,12 +3360,96 @@ namespace FineUIPro.Web.Evaluation
             }
             #endregion
 
+            #region 参与率
+            XSSFSheet participationRate = (XSSFSheet)hssfworkbook.GetSheet("Participation rate");
+            if (participationRateCount > 0)
+            {
+                var rowIndex = 1;
+                foreach (var vs in participationRateReport)
+                {
+                    if (participationRate.GetRow(rowIndex) == null) participationRate.CreateRow(rowIndex);
+                    //报告日期	
+                    if (participationRate.GetRow(rowIndex).GetCell(0) == null) participationRate.GetRow(rowIndex).CreateCell(0);
+                    participationRate.GetRow(rowIndex).GetCell(0).SetCellValue(vs.ReportMonth);
+                    participationRate.GetRow(rowIndex).GetCell(0).CellStyle = fontStyle;
+                    //部门	
+                    if (participationRate.GetRow(rowIndex).GetCell(1) == null) participationRate.GetRow(rowIndex).CreateCell(1);
+                    participationRate.GetRow(rowIndex).GetCell(1).SetCellValue(vs.Depart);
+                    participationRate.GetRow(rowIndex).GetCell(1).CellStyle = fontStyle;
+                    //团队	
+                    if (participationRate.GetRow(rowIndex).GetCell(2) == null) participationRate.GetRow(rowIndex).CreateCell(2);
+                    participationRate.GetRow(rowIndex).GetCell(2).SetCellValue(vs.Team);
+                    participationRate.GetRow(rowIndex).GetCell(2).CellStyle = fontStyle;
+                    //参与率	
+                    if (participationRate.GetRow(rowIndex).GetCell(3) == null) participationRate.GetRow(rowIndex).CreateCell(3);
+                    participationRate.GetRow(rowIndex).GetCell(3).SetCellValue(vs.Participation_Rate != null ? (vs.Participation_Rate * 100).ToString() + "%" : "0");
+                    participationRate.GetRow(rowIndex).GetCell(3).CellStyle = styleQfw;
+                    //参与率类型
+                    if (participationRate.GetRow(rowIndex).GetCell(4) == null) participationRate.GetRow(rowIndex).CreateCell(4);
+                    participationRate.GetRow(rowIndex).GetCell(4).SetCellValue(vs.Participation_Rate_Type);
+                    participationRate.GetRow(rowIndex).GetCell(4).CellStyle = fontStyle;
+                    //合同类型
+                    if (participationRate.GetRow(rowIndex).GetCell(5) == null) participationRate.GetRow(rowIndex).CreateCell(5);
+                    participationRate.GetRow(rowIndex).GetCell(5).SetCellValue(vs.IsSafe == true ? "安全" : "常规");
+                    participationRate.GetRow(rowIndex).GetCell(5).CellStyle = fontStyle;
+
+                    if ((int)((90 * (rowIndex + punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUser.Count)) / totalNum) > percent)
+                    {
+                        percent = (int)(100 * (rowIndex + punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUser.Count) / totalNum);
+                    }
+                    rowIndex++;
+                }
+            }
+
+            #endregion
+
+            #region 合同结算金额
+            XSSFSheet settlement = (XSSFSheet)hssfworkbook.GetSheet("Contract settlement amount");
+            if (sesReportCount > 0)
+            {
+                var rowSesIndex = 1;
+                foreach (var item in sesReportList)
+                {
+                    if (settlement.GetRow(rowSesIndex) == null) settlement.CreateRow(rowSesIndex);
+                    #region 列赋值
+                    //合同号
+                    if (settlement.GetRow(rowSesIndex).GetCell(0) == null) settlement.GetRow(rowSesIndex).CreateCell(0);
+                    settlement.GetRow(rowSesIndex).GetCell(0).SetCellValue(item.FO);
+                    settlement.GetRow(rowSesIndex).GetCell(0).CellStyle = fontStyle;
+                    //工单号
+                    if (settlement.GetRow(rowSesIndex).GetCell(1) == null) settlement.GetRow(rowSesIndex).CreateCell(1);
+                    settlement.GetRow(rowSesIndex).GetCell(1).SetCellValue(item.SES_No);
+                    settlement.GetRow(rowSesIndex).GetCell(1).CellStyle = fontStyle;
+                    //工单预算金额
+                    if (settlement.GetRow(rowSesIndex).GetCell(2) == null) settlement.GetRow(rowSesIndex).CreateCell(2);
+                    settlement.GetRow(rowSesIndex).GetCell(2).SetCellValue(item.SSR_budget.HasValue ? item.SSR_budget.Value.ToString("0.#") : "");
+                    settlement.GetRow(rowSesIndex).GetCell(2).CellStyle = styleQfw2;
+                    //工单结算金额
+                    if (settlement.GetRow(rowSesIndex).GetCell(3) == null) settlement.GetRow(rowSesIndex).CreateCell(3);
+                    settlement.GetRow(rowSesIndex).GetCell(3).SetCellValue(item.SSR_Actual_cost.HasValue ? item.SSR_Actual_cost.Value.ToString("0.#") : "");
+                    settlement.GetRow(rowSesIndex).GetCell(3).CellStyle = styleQfw2;
+                    //工单结算时间
+                    if (settlement.GetRow(rowSesIndex).GetCell(4) == null) settlement.GetRow(rowSesIndex).CreateCell(4);
+                    settlement.GetRow(rowSesIndex).GetCell(4).SetCellValue(item.SES_Confirmed_on.HasValue ? string.Format("{0:yyyy-MM}", item.SES_Confirmed_on) : "");
+                    settlement.GetRow(rowSesIndex).GetCell(4).CellStyle = fontStyle;
+                    #endregion
+                    if ((int)((90 * (rowSesIndex + punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUser.Count + participationRateCount)) / totalNum) > percent)
+                    {
+                        percent = (int)(100 * (rowSesIndex + punishCount + cmListCount + conListCount + overviewCount + safeOverviewCount + noEvaluatedUser.Count + participationRateCount) / totalNum);
+                    }
+                    rowSesIndex++;
+                }
+            }
+            #endregion
+
             ws.ForceFormulaRecalculation = true;
             //ws4.ForceFormulaRecalculation = true;
             wsCm.ForceFormulaRecalculation = true;
             wss.ForceFormulaRecalculation = true;
             wssafe.ForceFormulaRecalculation = true;
             wsevalu.ForceFormulaRecalculation = true;
+            participationRate.ForceFormulaRecalculation = true;
+            settlement.ForceFormulaRecalculation = true;
 
             FileStream fs = new FileStream(ReportFileName, FileMode.Create);
             hssfworkbook.Write(fs);
@@ -3048,6 +3467,8 @@ namespace FineUIPro.Web.Evaluation
             #endregion
         }
 
+        #endregion
+
         #region 权限设置
         /// <summary>
         /// 菜单按钮权限
diff --git a/FCL/FineUIPro.Web/File/Excel/Contractor.xlsx b/FCL/FineUIPro.Web/File/Excel/Contractor.xlsx
index e1a8a2e..5e94263 100644
Binary files a/FCL/FineUIPro.Web/File/Excel/Contractor.xlsx and b/FCL/FineUIPro.Web/File/Excel/Contractor.xlsx differ
diff --git a/FCL/FineUIPro.Web/File/Excel/Performance Report_CN.xlsx b/FCL/FineUIPro.Web/File/Excel/Performance Report_CN.xlsx
index aa70386..6674422 100644
Binary files a/FCL/FineUIPro.Web/File/Excel/Performance Report_CN.xlsx and b/FCL/FineUIPro.Web/File/Excel/Performance Report_CN.xlsx differ
diff --git a/FCL/FineUIPro.Web/File/Excel/Performance Report_EN.xlsx b/FCL/FineUIPro.Web/File/Excel/Performance Report_EN.xlsx
index eafe9d6..2b05bd7 100644
Binary files a/FCL/FineUIPro.Web/File/Excel/Performance Report_EN.xlsx and b/FCL/FineUIPro.Web/File/Excel/Performance Report_EN.xlsx differ
diff --git a/FCL/Model/Model.cs b/FCL/Model/Model.cs
index e42382e..78288ca 100644
--- a/FCL/Model/Model.cs
+++ b/FCL/Model/Model.cs
@@ -119,6 +119,9 @@ namespace Model
     partial void InsertEMC_ViolationClause(EMC_ViolationClause instance);
     partial void UpdateEMC_ViolationClause(EMC_ViolationClause instance);
     partial void DeleteEMC_ViolationClause(EMC_ViolationClause instance);
+    partial void InsertFC_BigDepartEvaRate(FC_BigDepartEvaRate instance);
+    partial void UpdateFC_BigDepartEvaRate(FC_BigDepartEvaRate instance);
+    partial void DeleteFC_BigDepartEvaRate(FC_BigDepartEvaRate instance);
     partial void InsertFC_ContractManagement(FC_ContractManagement instance);
     partial void UpdateFC_ContractManagement(FC_ContractManagement instance);
     partial void DeleteFC_ContractManagement(FC_ContractManagement instance);
@@ -509,6 +512,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<FC_BigDepartEvaRate> FC_BigDepartEvaRate
+		{
+			get
+			{
+				return this.GetTable<FC_BigDepartEvaRate>();
+			}
+		}
+		
 		public System.Data.Linq.Table<FC_ContractManagement> FC_ContractManagement
 		{
 			get
@@ -1336,6 +1347,8 @@ namespace Model
 		
 		private string _ContractorCN;
 		
+		private string _ContractorShortName;
+		
 		private EntitySet<EMC_OneTimeContracts> _EMC_OneTimeContracts;
 		
 		private EntitySet<FC_SESRelatedData> _FC_SESRelatedData;
@@ -1352,6 +1365,8 @@ namespace Model
     partial void OnContractorChanged();
     partial void OnContractorCNChanging(string value);
     partial void OnContractorCNChanged();
+    partial void OnContractorShortNameChanging(string value);
+    partial void OnContractorShortNameChanged();
     #endregion
 		
 		public Base_Contractor()
@@ -1441,6 +1456,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorShortName", DbType="NVarChar(50)")]
+		public string ContractorShortName
+		{
+			get
+			{
+				return this._ContractorShortName;
+			}
+			set
+			{
+				if ((this._ContractorShortName != value))
+				{
+					this.OnContractorShortNameChanging(value);
+					this.SendPropertyChanging();
+					this._ContractorShortName = value;
+					this.SendPropertyChanged("ContractorShortName");
+					this.OnContractorShortNameChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_EMC_OneTimeContracts_Base_Contractor", Storage="_EMC_OneTimeContracts", ThisKey="ContractorId", OtherKey="ContractorId", DeleteRule="NO ACTION")]
 		public EntitySet<EMC_OneTimeContracts> EMC_OneTimeContracts
 		{
@@ -12019,6 +12054,212 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.FC_BigDepartEvaRate")]
+	public partial class FC_BigDepartEvaRate : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private int _Id;
+		
+		private string _ReportMonth;
+		
+		private string _Depart;
+		
+		private string _Team;
+		
+		private System.Nullable<decimal> _Participation_Rate;
+		
+		private string _Participation_Rate_Type;
+		
+		private System.Nullable<bool> _IsSafe;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnIdChanging(int value);
+    partial void OnIdChanged();
+    partial void OnReportMonthChanging(string value);
+    partial void OnReportMonthChanged();
+    partial void OnDepartChanging(string value);
+    partial void OnDepartChanged();
+    partial void OnTeamChanging(string value);
+    partial void OnTeamChanged();
+    partial void OnParticipation_RateChanging(System.Nullable<decimal> value);
+    partial void OnParticipation_RateChanged();
+    partial void OnParticipation_Rate_TypeChanging(string value);
+    partial void OnParticipation_Rate_TypeChanged();
+    partial void OnIsSafeChanging(System.Nullable<bool> value);
+    partial void OnIsSafeChanged();
+    #endregion
+		
+		public FC_BigDepartEvaRate()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", AutoSync=AutoSync.OnInsert, DbType="Int NOT NULL IDENTITY", IsPrimaryKey=true, IsDbGenerated=true)]
+		public int Id
+		{
+			get
+			{
+				return this._Id;
+			}
+			set
+			{
+				if ((this._Id != value))
+				{
+					this.OnIdChanging(value);
+					this.SendPropertyChanging();
+					this._Id = value;
+					this.SendPropertyChanged("Id");
+					this.OnIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportMonth", DbType="NVarChar(50)")]
+		public string ReportMonth
+		{
+			get
+			{
+				return this._ReportMonth;
+			}
+			set
+			{
+				if ((this._ReportMonth != value))
+				{
+					this.OnReportMonthChanging(value);
+					this.SendPropertyChanging();
+					this._ReportMonth = value;
+					this.SendPropertyChanged("ReportMonth");
+					this.OnReportMonthChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Depart", DbType="NVarChar(50)")]
+		public string Depart
+		{
+			get
+			{
+				return this._Depart;
+			}
+			set
+			{
+				if ((this._Depart != value))
+				{
+					this.OnDepartChanging(value);
+					this.SendPropertyChanging();
+					this._Depart = value;
+					this.SendPropertyChanged("Depart");
+					this.OnDepartChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Team", DbType="NVarChar(50)")]
+		public string Team
+		{
+			get
+			{
+				return this._Team;
+			}
+			set
+			{
+				if ((this._Team != value))
+				{
+					this.OnTeamChanging(value);
+					this.SendPropertyChanging();
+					this._Team = value;
+					this.SendPropertyChanged("Team");
+					this.OnTeamChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Participation_Rate", DbType="Decimal(18,2)")]
+		public System.Nullable<decimal> Participation_Rate
+		{
+			get
+			{
+				return this._Participation_Rate;
+			}
+			set
+			{
+				if ((this._Participation_Rate != value))
+				{
+					this.OnParticipation_RateChanging(value);
+					this.SendPropertyChanging();
+					this._Participation_Rate = value;
+					this.SendPropertyChanged("Participation_Rate");
+					this.OnParticipation_RateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Participation_Rate_Type", DbType="NVarChar(50)")]
+		public string Participation_Rate_Type
+		{
+			get
+			{
+				return this._Participation_Rate_Type;
+			}
+			set
+			{
+				if ((this._Participation_Rate_Type != value))
+				{
+					this.OnParticipation_Rate_TypeChanging(value);
+					this.SendPropertyChanging();
+					this._Participation_Rate_Type = value;
+					this.SendPropertyChanged("Participation_Rate_Type");
+					this.OnParticipation_Rate_TypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSafe", DbType="Bit")]
+		public System.Nullable<bool> IsSafe
+		{
+			get
+			{
+				return this._IsSafe;
+			}
+			set
+			{
+				if ((this._IsSafe != value))
+				{
+					this.OnIsSafeChanging(value);
+					this.SendPropertyChanging();
+					this._IsSafe = value;
+					this.SendPropertyChanged("IsSafe");
+					this.OnIsSafeChanged();
+				}
+			}
+		}
+		
+		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.FC_ContractManagement")]
 	public partial class FC_ContractManagement : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -13699,6 +13940,12 @@ namespace Model
 		
 		private System.Nullable<bool> _IsSafe;
 		
+		private string _ContractorCN;
+		
+		private string _ContractorEN;
+		
+		private string _ContractorShortName;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -13765,6 +14012,12 @@ namespace Model
     partial void OnCTEDAvgScoreChanged();
     partial void OnIsSafeChanging(System.Nullable<bool> value);
     partial void OnIsSafeChanged();
+    partial void OnContractorCNChanging(string value);
+    partial void OnContractorCNChanged();
+    partial void OnContractorENChanging(string value);
+    partial void OnContractorENChanged();
+    partial void OnContractorShortNameChanging(string value);
+    partial void OnContractorShortNameChanged();
     #endregion
 		
 		public FC_OverviewReport()
@@ -14392,6 +14645,66 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorCN", DbType="NVarChar(100)")]
+		public string ContractorCN
+		{
+			get
+			{
+				return this._ContractorCN;
+			}
+			set
+			{
+				if ((this._ContractorCN != value))
+				{
+					this.OnContractorCNChanging(value);
+					this.SendPropertyChanging();
+					this._ContractorCN = value;
+					this.SendPropertyChanged("ContractorCN");
+					this.OnContractorCNChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorEN", DbType="NVarChar(100)")]
+		public string ContractorEN
+		{
+			get
+			{
+				return this._ContractorEN;
+			}
+			set
+			{
+				if ((this._ContractorEN != value))
+				{
+					this.OnContractorENChanging(value);
+					this.SendPropertyChanging();
+					this._ContractorEN = value;
+					this.SendPropertyChanged("ContractorEN");
+					this.OnContractorENChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorShortName", DbType="NVarChar(50)")]
+		public string ContractorShortName
+		{
+			get
+			{
+				return this._ContractorShortName;
+			}
+			set
+			{
+				if ((this._ContractorShortName != value))
+				{
+					this.OnContractorShortNameChanging(value);
+					this.SendPropertyChanging();
+					this._ContractorShortName = value;
+					this.SendPropertyChanged("ContractorShortName");
+					this.OnContractorShortNameChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -29562,6 +29875,8 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _CreateDate;
 		
+		private string _ContractorShortName;
+		
 		public View_EMC_Punishment()
 		{
 		}
@@ -30157,6 +30472,22 @@ namespace Model
 				}
 			}
 		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorShortName", DbType="NVarChar(50)")]
+		public string ContractorShortName
+		{
+			get
+			{
+				return this._ContractorShortName;
+			}
+			set
+			{
+				if ((this._ContractorShortName != value))
+				{
+					this._ContractorShortName = value;
+				}
+			}
+		}
 	}
 	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_EMC_Que_Punishment")]
@@ -31311,6 +31642,8 @@ namespace Model
 		
 		private System.Nullable<bool> _IsExport;
 		
+		private string _ContractorShortName;
+		
 		public View_FC_ContractManagement()
 		{
 		}
@@ -31570,6 +31903,22 @@ namespace Model
 				}
 			}
 		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorShortName", DbType="NVarChar(50)")]
+		public string ContractorShortName
+		{
+			get
+			{
+				return this._ContractorShortName;
+			}
+			set
+			{
+				if ((this._ContractorShortName != value))
+				{
+					this._ContractorShortName = value;
+				}
+			}
+		}
 	}
 	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_FC_ContractManagementLists")]
@@ -32025,6 +32374,12 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _Expire_Date;
 		
+		private System.Nullable<System.DateTime> _Validate_Date;
+		
+		private string _ContractorShortName;
+		
+		private string _Discipline;
+		
 		public View_FC_Contractor()
 		{
 		}
@@ -32092,6 +32447,54 @@ namespace Model
 				}
 			}
 		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Validate_Date", DbType="DateTime")]
+		public System.Nullable<System.DateTime> Validate_Date
+		{
+			get
+			{
+				return this._Validate_Date;
+			}
+			set
+			{
+				if ((this._Validate_Date != value))
+				{
+					this._Validate_Date = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorShortName", DbType="NVarChar(50)")]
+		public string ContractorShortName
+		{
+			get
+			{
+				return this._ContractorShortName;
+			}
+			set
+			{
+				if ((this._ContractorShortName != value))
+				{
+					this._ContractorShortName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Discipline", DbType="NVarChar(1000)")]
+		public string Discipline
+		{
+			get
+			{
+				return this._Discipline;
+			}
+			set
+			{
+				if ((this._Discipline != value))
+				{
+					this._Discipline = value;
+				}
+			}
+		}
 	}
 	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_FC_Report")]