五环大屏；进度管理；等

SGGL/BLL/Common/Const.cs

@@ -574,35 +574,40 @@ namespace BLL
         public static string WorkPost_Fitter2 = "F49B8430-AC71-40B2-86A3-6825C73F59E5";
 
         /// <summary>
-        /// 焊工岗位Id
+        /// 焊工岗位Id——管道焊工
         /// </summary>
         public static string WorkPost_Welder = "97afac2d-7ffb-49de-bf15-4b49ef24df63";
 
         /// <summary>
-        /// 焊工岗位Id
+        /// 焊工岗位Id——结构焊工
         /// </summary>
         public static string WorkPost_Welder1 = "16c736b6-7ee1-4069-8b57-1a658e6a615f";
 
         /// <summary>
-        /// 焊工岗位Id
+        /// 焊工岗位Id——设备焊工
         /// </summary>
         public static string WorkPost_Welder2 = "36644e8c-0593-4ca7-880f-6a55510c51a1";
 
         /// <summary>
-        /// 焊工岗位Id
+        /// 焊工岗位Id——电焊工
         /// </summary>
         public static string WorkPost_Welder3 = "5383f797-da4a-4547-b2aa-905a99c1bcfa";
 
         /// <summary>
-        /// 焊工岗位Id
+        /// 焊工岗位Id——管道焊工
         /// </summary>
         public static string WorkPost_Welder4 = "97afac2d-7ffb-49de-bf15-4b49ef24df63";
 
         /// <summary>
-        /// 焊工岗位Id
+        /// 焊工岗位Id——其他焊工
         /// </summary>
         public static string WorkPost_Welder5 = "F8CD2EB0-1D46-422B-A21C-331669B2CF6C";
 
+        /// <summary>
+        /// 焊工岗位Id——工艺焊工
+        /// </summary>
+        public static string WorkPost_Welder6 = "4ACC633F-BD81-4CBB-9058-A4E4DFFE7881";
+
         /// <summary>
         /// 铆工岗位Id
         /// </summary>

SGGL/BLL/HSSE/SitePerson/PersonService.cs

@@ -122,7 +122,7 @@ namespace BLL
         /// <param name="PageSize">每页数量</param>
         /// <returns></returns>
         public static IEnumerable getListData(string projectId, string unitId, string personName, string identityCard, string treamGroupId, string workPostIds,
-                    bool ckTrain, string postType, bool ckJT, bool ckIdCardInfoNotOK, Grid Grid1,bool isBlack=false)
+                    bool ckTrain, string postType, bool ckJT, bool ckIdCardInfoNotOK, bool chManager, Grid Grid1,bool isBlack=false)
         {
             IQueryable<Model.View_SitePerson_Person> getPersonList = getPersonLists.Where(x => x.ProjectId == projectId);
             if (!string.IsNullOrEmpty(unitId))
@@ -180,6 +180,10 @@ namespace BLL
             {
                 getPersonList = getPersonList.Where(x => x.RealNameAddTime == null);
             }
+            if (chManager)
+            {
+                getPersonList = getPersonList.Where(x => x.PostType == Const.PostType_1);
+            }
             if (ckIdCardInfoNotOK)
             {
                 getPersonList = getPersonList.Where(x => x.IdentityCard == null || x.HeadImage == null || (x.IdentityCard.Length != 15 && x.IdentityCard.Length != 18));

SGGL/BLL/JDGL/Check/MonthPlanService.cs

@@ -49,6 +49,7 @@ namespace BLL
                 PlanDate = MonthPlan.PlanDate,
                 DutyPerson = MonthPlan.DutyPerson,
                 RealDate = MonthPlan.RealDate,
+                IsOK = MonthPlan.IsOK,
                 Remark = MonthPlan.Remark,
                 CompileMan = MonthPlan.CompileMan,
                 CompileDate = MonthPlan.CompileDate,
@@ -73,6 +74,7 @@ namespace BLL
                 newMonthPlan.PlanDate = MonthPlan.PlanDate;
                 newMonthPlan.DutyPerson = MonthPlan.DutyPerson;
                 newMonthPlan.RealDate = MonthPlan.RealDate;
+                newMonthPlan.IsOK = MonthPlan.IsOK;
                 newMonthPlan.Remark = MonthPlan.Remark;
                 newMonthPlan.CompileMan = MonthPlan.CompileMan;
                 newMonthPlan.CompileDate = MonthPlan.CompileDate;

SGGL/BLL/PMP/PMPDataService.cs

@@ -189,7 +189,7 @@ namespace BLL
         /// 项目OBS查询接口
         /// </summary>
         /// <param name="proId">项目Id</param>
-        public static List<Model.PMPOBSOutInput> GetPMPProjectOBSMasterData(string proId)
+        public static List<Model.PMPOBSOutInput> GetPMPProjectOBSData(string proId)
         {
             string url = $"{PmpApiUrl}/api/standard/dis/query_all";
             var token = GetToken();