修改特种作业人员汇总数量调整；修改pu接口端口

.vs/SGGL_SeDin_New/v17/DocumentLayout.backup.json

@@ -74,6 +74,10 @@
             {
               "$type": "Bookmark",
               "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
             }
           ]
         }

.vs/SGGL_SeDin_New/v17/DocumentLayout.json

@@ -8,21 +8,13 @@
       "VerticalTabListWidth": 256,
       "DocumentGroups": [
         {
-          "DockedWidth": 386,
+          "DockedWidth": 200,
           "SelectedChildIndex": -1,
           "Children": [
             {
               "$type": "Bookmark",
               "Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}"
             },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:130:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:132:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
             {
               "$type": "Bookmark",
               "Name": "ST:133:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
@@ -51,14 +43,6 @@
               "$type": "Bookmark",
               "Name": "ST:3:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
             },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:131:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
             {
               "$type": "Bookmark",
               "Name": "ST:0:0:{1a46fd64-28d5-434c-8eb3-17a02d419b53}"
@@ -67,6 +51,18 @@
               "$type": "Bookmark",
               "Name": "ST:0:0:{5726b0e3-1012-5233-81f9-d1fad48e7a56}"
             },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:137:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:138:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:136:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
             {
               "$type": "Bookmark",
               "Name": "ST:2:0:{b9f91511-5ca5-40ec-9726-f3e3a7e534e2}"
@@ -77,7 +73,7 @@
             },
             {
               "$type": "Bookmark",
-              "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+              "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
             }
           ]
         }

SGGL/BLL/HSSE/CostGoods/CostManageService.cs

@@ -407,7 +407,7 @@ namespace BLL
                     var jsonBody = JsonConvert.SerializeObject(requestBody);
 
                     // 调用HSE接口推送数据
-                    var url = "http://172.29.60.33:8080";
+                    var url = "http://172.29.60.33:9037";
                     var requestGetTokenUrl = url + "/auth/getToken";
                     string requestGetTokenBody = "{\"username\": \"coadmin\",\"password\": \"coadminPu@2025\"}";
                     var response = Funs.RequestPost(requestGetTokenUrl, "", requestGetTokenBody);

SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs

@@ -4191,19 +4191,22 @@ namespace BLL
         /// <returns></returns>
         public static List<Model.OfSafetySupervisorsOutput> GetQualityPersonNum()
         {
-            var result = (from x in Funs.DB.QualityAudit_PersonQuality
+            var result = (from p in Funs.DB.SitePerson_Person
-                          join p in Funs.DB.SitePerson_Person on x.PersonId equals p.PersonId into pGroup
-                          from p in pGroup.DefaultIfEmpty()
-                          join pp in Funs.DB.Person_Persons on p.PersonId equals pp.PersonId into ppGroup
-                          from pp in ppGroup.DefaultIfEmpty()
                           join bp in Funs.DB.Base_Project on p.ProjectId equals bp.ProjectId into bpGroup
                           from bp in bpGroup.DefaultIfEmpty()
                           join u in Funs.DB.Base_Unit on p.UnitId equals u.UnitId into uGroup
                           from u in uGroup.DefaultIfEmpty()
-                          join y in Funs.DB.QualityAudit_PersonQuality on x.PersonId equals y.PersonId
+                          join q in Funs.DB.QualityAudit_PersonQuality on p.PersonId equals q.PersonId into qGroup
+                          from q in qGroup.DefaultIfEmpty()
                           join m in Funs.DB.Base_WorkPost on p.WorkPostId equals m.WorkPostId into mGroup
                           from m in mGroup.DefaultIfEmpty()
-                          where BeUnderConstructionList.Contains(p.ProjectId) && m.PostType == Const.PostType_2 && (x.LimitDate == null || x.LimitDate < DateTime.Now)
+                          join su in Funs.DB.Person_Persons on q.CompileMan equals su.PersonId into suGroup
+                          from su in suGroup.DefaultIfEmpty()
+                          join bc in Funs.DB.Base_Certificate on q.CertificateId equals bc.CertificateId into bcGroup
+                          from bc in bcGroup.DefaultIfEmpty()
+                          join su1 in Funs.DB.Person_Persons on q.AuditorId equals su1.PersonId into su1Group
+                          from su1 in su1Group.DefaultIfEmpty()
+                          where BeUnderConstructionList.Contains(p.ProjectId) && m.PostType == Const.PostType_2 
                           select new Model.OfSafetySupervisorsOutput
                           {
                               ProjectId = p.ProjectId,
@@ -4211,12 +4214,13 @@ namespace BLL
                               UnitId = u.UnitId,
                               UnitName = u.UnitName,
                               Name = p.PersonName,
-                              Sex = pp.Sex == null ? "" : (pp.Sex == "1" ? "男" : "女"),
+                              Sex = su.Sex == null ? "" : (su.Sex == "1" ? "男" : "女"),
                               IdentityCard = p.IdentityCard,
                               WorkPostName = m.WorkPostName == null ? "" : m.WorkPostName,
-                              Phone = pp.Telephone
+                              Phone = su.Telephone
                           }).ToList();
             return result;
+
         }
         /// <summary>
         /// 获取在岗特种作业人员数量(异步)

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -16769,7 +16769,7 @@
     </COMReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">