2022-10-10 焊接材料编码库导入修改及其相关联界面修改。小程序包装信息接口添加。合同劳务人员下拉框

SGGL/BLL/HJGL/WeldingManage/HJGL_WeldingReportService.cs

@@ -46,7 +46,7 @@ namespace BLL
             return result;
         }
         /// <summary>
-        /// 工厂预制完成率
+        /// 工厂预制完成数
         /// </summary>
         /// <param name="projectId"></param>
         /// <returns></returns>
@@ -72,7 +72,7 @@ namespace BLL
             return result;
         }
         /// <summary>
-        /// 工厂预制未完成率
+        /// 工厂预制未完成数
         /// </summary>
         /// <param name="projectId"></param>
         /// <returns></returns>
@@ -83,7 +83,7 @@ namespace BLL
             return result;
         }
         /// <summary>
-        /// 现场安装完成率
+        /// 现场安装完成数
         /// </summary>
         /// <param name="projectId"></param>
         /// <returns></returns>
@@ -109,7 +109,7 @@ namespace BLL
             return result;
         }
         /// <summary>
-        /// 现场安装未完成率
+        /// 现场安装未完成数
         /// </summary>
         /// <param name="projectId"></param>
         /// <returns></returns>
@@ -120,7 +120,7 @@ namespace BLL
             return result;
         }
         /// <summary>
-        /// 管道完成预制率
+        /// 管道完成预制数
         /// </summary>
         /// <param name="projectId"></param>
         /// <returns></returns>
@@ -131,7 +131,7 @@ namespace BLL
             return result;
         }
         /// <summary>
-        /// 管道未完成预制率
+        /// 管道未完成预制数
         /// </summary>
         /// <param name="projectId"></param>
         /// <returns></returns>
@@ -141,6 +141,11 @@ namespace BLL
             result = GetSumSize(projectId, 0) - GetPipeRate_finished(projectId);
             return result;
         }
+        /// <summary>
+        /// 焊工功效
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
         public static  decimal  GetWelderEfficacy(string projectId)
         {
             decimal result = 0;
@@ -160,6 +165,48 @@ namespace BLL
   
             }
 
+            return decimal.Truncate(result);
+        }
+        public static decimal GetWelderEfficacy_GC(string projectId)
+        {
+            decimal result = 0;
+            var db = Funs.DB;
+            var q = (from x in db.HJGL_WeldJoint
+                     join y in db.HJGL_WeldingDaily on x.WeldingDailyId equals y.WeldingDailyId
+                     where x.ProjectId == projectId && x.JointAttribute=="预制口"
+                     group x by x.ProjectId into g
+                     select new
+                     {
+                         TotalDin = g.Sum(x => x.Size),
+                         worktime = g.Select(x => x.WeldingDailyId).Distinct().Count(),
+                     });
+            foreach (var item in q)
+            {
+                result = decimal.Divide((decimal)item.TotalDin, item.worktime);
+
+            }
+
+            return decimal.Truncate(result);
+        }
+        public static decimal GetWelderEfficacy_XC(string projectId)
+        {
+            decimal result = 0;
+            var db = Funs.DB;
+            var q = (from x in db.HJGL_WeldJoint
+                     join y in db.HJGL_WeldingDaily on x.WeldingDailyId equals y.WeldingDailyId
+                     where x.ProjectId == projectId && x.JointAttribute == "安装口"
+                     group x by x.ProjectId into g
+                     select new
+                     {
+                         TotalDin = g.Sum(x => x.Size),
+                         worktime = g.Select(x => x.WeldingDailyId).Distinct().Count(),
+                     });
+            foreach (var item in q)
+            {
+                result = decimal.Divide((decimal)item.TotalDin, item.worktime);
+
+            }
+
             return decimal.Truncate(result);
         }
     }