0813

SGGL/BLL/JDGL/WBS/CnProfessionService.cs

@@ -24,6 +24,30 @@ namespace BLL
             return Funs.DB.WBS_CnProfession.FirstOrDefault(e => e.CnProfessionId == cnProfessionId);
         }
 
+        /// <summary>
+        /// 根据装置Id和专业编号获取专业Id
+        /// </summary>
+        /// <param name="unitProjectId">专业Id</param>
+        /// <returns></returns>
+        public static string GetCnProfessionIdByInstallationIdAndOldId(string installationId, string oldId)
+        {
+            string cnProfessionId = string.Empty;
+            Model.SGGLDB db = Funs.DB;
+            var ins = db.Project_Installation.FirstOrDefault(x => x.InstallationId == installationId);
+            if (ins.IsEnd == true)
+            {
+                var cn = db.WBS_CnProfession.FirstOrDefault(x => x.InstallationId == ins.InstallationId && x.OldId.ToString() == oldId);
+                cnProfessionId = cn.CnProfessionId;
+            }
+            else
+            {
+                var childIns = db.Project_Installation.FirstOrDefault(x => x.SuperInstallationId == installationId);
+                cnProfessionId = GetCnProfessionIdByInstallationIdAndOldId(childIns.InstallationId, oldId);
+            }
+            return cnProfessionId;
+        }
+
+
         /// <summary>
         /// 增加专业
         /// </summary>
@@ -64,6 +88,8 @@ namespace BLL
             newCnP.WeightsMoney = cnProfession.WeightsMoney;
             newCnP.IsWeightsApprove = cnProfession.IsWeightsApprove;
             newCnP.UnitId = cnProfession.UnitId;
+            newCnP.IsSelected = cnProfession.IsSelected;
+            newCnP.IsApprove = cnProfession.IsApprove;
             db.SubmitChanges();
         }