Merge branch 'master' of http://47.104.102.122:3000/lpf/CNCEC_SUBQHSE_WUHUAN

SGGL/BLL/BLL.csproj

@@ -610,6 +610,8 @@
     <Compile Include="JDGL\WBS\CostControlService.cs" />
     <Compile Include="JDGL\WBS\EquipmentMaterialBigTypeService.cs" />
     <Compile Include="JDGL\WBS\EquipmentMaterialTypeService.cs" />
+    <Compile Include="JDGL\WBS\JDGLWBSDetailService.cs" />
+    <Compile Include="JDGL\WBS\JDGLWBSService.cs" />
     <Compile Include="JDGL\WBS\MilePostService.cs" />
     <Compile Include="JDGL\WBS\UnitProjectInitService.cs" />
     <Compile Include="JDGL\WBS\UnitProjectService.cs" />

SGGL/BLL/JDGL/WBS/JDGLWBSDetailService.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    public static class JDGLWBSDetailService
+    {
+        public static List<Model.JDGL_WBSDetail> GetWBSDetailsByWorkPackageId(string workPackageId)
+        {
+            return (from x in Funs.DB.JDGL_WBSDetail where x.WorkPackageId == workPackageId select x).ToList();
+        }
+    }
+}

SGGL/BLL/JDGL/WBS/JDGLWBSService.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    public static class JDGLWBSService
+    {
+        public static List<Model.JDGL_WBS> GetWBSsByProjectId(string projectId,string parentId)
+        {
+            return (from x in Funs.DB.JDGL_WBS where x.ParentId == parentId && x.ProjectId == projectId orderby x.PathCode select x).ToList();
+        }
+    }
+}

SGGL/BLL/OpenService/MonitorService.cs

@@ -2179,7 +2179,7 @@ namespace BLL
             //////推送订阅消息 
             GetDataService.SendSubscribeMessage();
             GetDataService.CorrectingPersonInOutNumber(null);
-  
+
         }
 
         #region 启动监视器 定时每天执行  获取指定项目管道焊接工程量等信息
@@ -2230,7 +2230,8 @@ namespace BLL
             }
             finally
             {
-                getPipelineWeldingQuantities.Interval = 1000 * 3600 * 24;
+                //getPipelineWeldingQuantities.Interval = 1000 * 3600 * 24;
+                getPipelineWeldingQuantities.Interval = 1000 * 3600 * 12;
                 getPipelineWeldingQuantities.Start();
             }
         }