Merge branch 'master' of http://47.104.102.122:3000/shecs/Basf_FCL

FCL/BLL/BaseInfo/DepartService.cs

@@ -56,6 +56,7 @@ namespace BLL
             newDepart.DepartName = depart.DepartName;
             newDepart.Remark = depart.Remark;
             newDepart.DepartLeader = depart.DepartLeader;
+            newDepart.DelegatedRepresentative = depart.DelegatedRepresentative;
             Funs.DB.Base_Depart.InsertOnSubmit(newDepart);
             Funs.DB.SubmitChanges();
         }
@@ -73,6 +74,7 @@ namespace BLL
                 newDepart.DepartName = depart.DepartName;
                 newDepart.Remark = depart.Remark;
                 newDepart.DepartLeader = depart.DepartLeader;
+                newDepart.DelegatedRepresentative = depart.DelegatedRepresentative;
                 Funs.DB.SubmitChanges();
             }
         }

FCL/BLL/BaseInfo/ViolationClauseService.cs

@@ -17,7 +17,7 @@ namespace BLL
 
         public static List<Model.EMC_ViolationClause> GetSupViolationClause()
         {
-            return Funs.DB.EMC_ViolationClause.Where(e => e.SupViolationClause == null).ToList();
+            return Funs.DB.EMC_ViolationClause.Where(e => e.SupViolationClause == null).OrderBy(e => e.SortIndex).ToList();
         }
 
         /// <summary>

FCL/BLL/Common/Const.cs

@@ -57,6 +57,11 @@ namespace BLL
         /// </summary>
         public static string Role_CommonUsers = "bdb8c4fe-5082-4ce0-af5e-70f39f50ea41";
 
+        /// <summary>
+        /// 承包商管理角色ID
+        /// </summary>
+        public static string Role_Contractor_LeaderId = "48b2376d-421f-4b12-b5be-c0c538bfe3e9";
+
         /// <summary>
         /// 邮件配置Id
         /// </summary>
@@ -263,6 +268,11 @@ namespace BLL
         public const string BtnConTab13View = "承包商View";
         #endregion
 
+        /// <summary>
+        /// 质量事件报告修改全部
+        /// </summary>
+        public const string BtnModifyAll = "Modify All";
+
         #endregion
 
         #region 初始化上传路径

FCL/BLL/SES/PunishmentService.cs

@@ -130,6 +130,7 @@ namespace BLL
                 newPunishment.MainCoordinatorEndDate = punishment.MainCoordinatorEndDate;
                 newPunishment.UserDepStartDate = punishment.UserDepStartDate;
                 newPunishment.UserDepEndDate = punishment.UserDepEndDate;
+                newPunishment.Pause = punishment.Pause;
 
                 Funs.DB.SubmitChanges();
             }

FCL/BLL/SES/SESRelatedDataService.cs

@@ -226,7 +226,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// 根据承包商ID获取未关闭的FO
+        /// 根据承包商ID获取未关闭的且有效的及过期一年合同
         /// </summary>
         /// <param name="dropName"></param>
         /// <param name="ContractorId"></param>
@@ -235,7 +235,12 @@ namespace BLL
         {
             dropName.DataValueField = "FO_NO";
             dropName.DataTextField = "FO_NO";
-            dropName.DataSource = (from x in Funs.DB.FC_SESRelatedData where x.Contractor == ContractorId && x.FC_Status != "Closed" orderby x.FO_NO select x.FO_NO).Distinct();
+            dropName.DataSource = (from x in Funs.DB.FC_SESRelatedData 
+                                   where x.Contractor == ContractorId 
+                                   && x.FC_Status != "Closed" 
+                                   && x.Expire_Date.Value.AddYears(1) >= DateTime.Now
+                                   orderby x.FO_NO 
+                                   select x.FO_NO).Distinct();
             dropName.DataBind();
             if (isShowPlease)
             {

FCL/BLL/SysManage/Sys_UserService.cs

@@ -350,7 +350,7 @@ namespace BLL
         /// <returns></returns>
         public static List<Model.View_Sys_Users> GetUserViewList()
         {
-            return (from x in Funs.DB.View_Sys_Users where x.IsPost == true orderby x.DepartName, x.UserName select x).ToList();
+            return (from x in Funs.DB.View_Sys_Users orderby x.DepartName, x.UserName select x).ToList();
         }
 
         /// <summary>