提交代码

SGGL/BLL/Common/Const.cs

@@ -400,6 +400,11 @@ namespace BLL
         /// </summary>
         public static string WorkPost_AnticorrosionWorker = "010CBFD3-51B9-4C48-A6F8-15326D810AA5";
 
+        /// <summary>
+        /// 普工岗位Id
+        /// </summary>
+        public static string WorkPost_PGWorker = "D30865B9-A966-441D-84AC-289BCC5A9E4D";
+
         /// <summary>
         /// 其他岗位Id
         /// </summary>

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -19406,7 +19406,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

SGGL/FineUIPro.Web/Web.config

@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="true" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>

SGGL/FineUIPro.Web/common/mainProject2.aspx.cs

@@ -939,6 +939,17 @@ namespace FineUIPro.Web.common
                              select y).Distinct();
                 Model.SingleSerie s = new Model.SingleSerie();
                 List<double> listdata = new List<double>();
+                //管理人员
+                listCategories.Add("管理人员");
+                int workPostCount12 = (from x in persons
+                                       join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                                       where y.PostType == Const.PostType_1
+                                       select x).Count();
+                listdata.Add(workPostCount12);
+                //普工
+                listCategories.Add("普工");
+                int workPostCountP = persons.Count(x => x.WorkPostId == Const.WorkPost_PGWorker);
+                listdata.Add(workPostCountP);
                 //木工
                 listCategories.Add("木工");
                 int workPostCount1 = persons.Count(x => x.WorkPostId == Const.WorkPost_Carpentry);
@@ -947,18 +958,6 @@ namespace FineUIPro.Web.common
                 listCategories.Add("钢筋工");
                 int workPostCount2 = persons.Count(x => x.WorkPostId == Const.WorkPost_SteelWorker);
                 listdata.Add(workPostCount2);
-                //瓦工
-                listCategories.Add("瓦工");
-                int workPostCount3 = persons.Count(x => x.WorkPostId == Const.WorkPost_Bricklayer);
-                listdata.Add(workPostCount3);
-                //混凝土工
-                listCategories.Add("混凝土工");
-                int workPostCount4 = persons.Count(x => x.WorkPostId == Const.WorkPost_ConcreteWorker);
-                listdata.Add(workPostCount4);
-                //钳工
-                listCategories.Add("钳工");
-                int workPostCount5 = persons.Count(x => x.WorkPostId == Const.WorkPost_Fitter1 || x.WorkPostId == Const.WorkPost_Fitter2);
-                listdata.Add(workPostCount5);
                 //焊工
                 listCategories.Add("焊工");
                 int workPostCount6 = persons.Count(x => x.WorkPostId == Const.WorkPost_Welder1 || x.WorkPostId == Const.WorkPost_Welder2 ||
@@ -972,30 +971,35 @@ namespace FineUIPro.Web.common
                 listCategories.Add("管工");
                 int workPostCount8 = persons.Count(x => x.WorkPostId == Const.WorkPost_Foreman);
                 listdata.Add(workPostCount8);
-                //电工
+                ////瓦工
-                listCategories.Add("电工");
+                //listCategories.Add("瓦工");
-                int workPostCount9 = persons.Count(x => x.WorkPostId == Const.WorkPost_Electrician1 || x.WorkPostId == Const.WorkPost_Electrician2
+                //int workPostCount3 = persons.Count(x => x.WorkPostId == Const.WorkPost_Bricklayer);
-                         || x.WorkPostId == Const.WorkPost_Electrician3);
+                //listdata.Add(workPostCount3);
-                listdata.Add(workPostCount9);
+                ////混凝土工
-                //仪表工
+                //listCategories.Add("混凝土工");
-                listCategories.Add("仪表工");
+                //int workPostCount4 = persons.Count(x => x.WorkPostId == Const.WorkPost_ConcreteWorker);
-                int workPostCount10 = persons.Count(x => x.WorkPostId == Const.WorkPost_Instrumentalist);
+                //listdata.Add(workPostCount4);
-                listdata.Add(workPostCount10);
+                ////钳工
-                //防腐保温工
+                //listCategories.Add("钳工");
-                listCategories.Add("防腐保温工");
+                //int workPostCount5 = persons.Count(x => x.WorkPostId == Const.WorkPost_Fitter1 || x.WorkPostId == Const.WorkPost_Fitter2);
-                int workPostCount11 = persons.Count(x => x.WorkPostId == Const.WorkPost_AnticorrosionWorker);
+                //listdata.Add(workPostCount5);
-                listdata.Add(workPostCount11);
+                ////电工
-                //防腐保温工
+                //listCategories.Add("电工");
-                listCategories.Add("管理人员");
+                //int workPostCount9 = persons.Count(x => x.WorkPostId == Const.WorkPost_Electrician1 || x.WorkPostId == Const.WorkPost_Electrician2
-                int workPostCount12 = (from x in persons
+                //         || x.WorkPostId == Const.WorkPost_Electrician3);
-                                       join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                //listdata.Add(workPostCount9);
-                                       where y.PostType == Const.PostType_1
+                ////仪表工
-                                       select x).Count();
+                //listCategories.Add("仪表工");
-                listdata.Add(workPostCount12);
+                //int workPostCount10 = persons.Count(x => x.WorkPostId == Const.WorkPost_Instrumentalist);
+                //listdata.Add(workPostCount10);
+                ////防腐保温工
+                //listCategories.Add("防腐保温工");
+                //int workPostCount11 = persons.Count(x => x.WorkPostId == Const.WorkPost_AnticorrosionWorker);
+                //listdata.Add(workPostCount11);
                 //其他
                 listCategories.Add("其他");
-                int workPostCount13 = persons.Count() - workPostCount1 - workPostCount2 - workPostCount3 - workPostCount4 - workPostCount5 - workPostCount6 - workPostCount7
+                int workPostCount13 = persons.Count() - workPostCount1 - workPostCount2 - workPostCountP - workPostCount6 - workPostCount7
-                    - workPostCount8 - workPostCount9 - workPostCount10 - workPostCount11 - workPostCount12;
+                    - workPostCount8  - workPostCount12;
                 listdata.Add(workPostCount13);
                 s.data = listdata;
                 series.Add(s);