添加考勤结果人员系数

performance/Performance.Api/wwwroot/Performance.DtoModels.xml

@@ -272,6 +272,11 @@
             姓名
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.PerAttendanceIssueDto.PermanentStaff">
+            <summary>
+            人员系数
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.PerAttendanceIssueDto.BeginDate">
             <summary>
             在科开始时间
@@ -2933,6 +2938,11 @@
             姓名
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.PermanentStaff">
+            <summary>
+            人员系数
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.BeginDate">
             <summary>
             在科开始时间
@@ -3198,6 +3208,11 @@
             姓名
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.AttendanceStatistics.PermanentStaff">
+            <summary>
+            人员系数
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.AttendanceStatistics.BeginDate">
             <summary>
             在科开始时间

performance/Performance.Api/wwwroot/Performance.EntityModels.xml

@@ -6158,6 +6158,11 @@
             姓名
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.PermanentStaff">
+            <summary>
+            人员系数
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.Entity.per_attendance_issue.BeginDate">
             <summary>
             在科开始时间
@@ -6995,7 +7000,7 @@
         </member>
         <member name="P:Performance.EntityModels.per_employee.PermanentStaff">
             <summary>
-            核算人数
+            人员系数
             </summary>
         </member>
         <member name="P:Performance.EntityModels.per_employee.EfficiencyNumber">
@@ -9528,6 +9533,11 @@
             姓名
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.Other.view_attendance.PermanentStaff">
+            <summary>
+            人员系数
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.Other.view_attendance.AttendanceDate">
             <summary>
             考勤时间

performance/Performance.DtoModels/PerAttendanceIssueDto.cs

@@ -19,6 +19,7 @@ public PerAttendanceIssueDto(AttendanceStatistics item)
             AccountingUnit = item.AccountingUnit;
             PersonnelNumber = item.PersonnelNumber;
             PersonnelName = item.PersonnelName;
+            PermanentStaff = item.PermanentStaff;
             BeginDate = item.BeginDate;
             EndDate = item.EndDate;
             DeductionDays = item.Detial.Where(w => !w.Remark.Contains("不核减")).Sum(w => w.Value);
@@ -36,6 +37,7 @@ public PerAttendanceIssueDto(per_attendance_issue item)
             AccountingUnit = item.AccountingUnit;
             PersonnelNumber = item.PersonnelNumber;
             PersonnelName = item.PersonnelName;
+            PermanentStaff = item.PermanentStaff;
             BeginDate = item.BeginDate;
             EndDate = item.EndDate;
             DeductionDays = item.DeductionDays;
@@ -66,6 +68,10 @@ public PerAttendanceIssueDto(per_attendance_issue item)
         /// </summary>
         public string PersonnelName { get; set; }
         /// <summary>
+        /// 人员系数
+        /// </summary>
+        public decimal? PermanentStaff { get; set; }
+        /// <summary>
         /// 在科开始时间
         /// </summary>
         public DateTime? BeginDate { get; set; }

performance/Performance.DtoModels/Response/AttendanceAuditDetail.cs

@@ -38,6 +38,10 @@ public class AttendanceAuditDetail
         /// </summary>
         public string PersonnelName { get; set; }
         /// <summary>
+        /// 人员系数
+        /// </summary>
+        public decimal PermanentStaff { get; set; }
+        /// <summary>
         /// 在科开始时间
         /// </summary>
         public DateTime? BeginDate { get; set; }
@@ -85,7 +89,7 @@ public class AttendanceAuditDetails
         /// <summary>
         /// 请假天数
         /// </summary>
-        public int Value { get; set; }
+        public object Value { get; set; }
         /// <summary>
         /// 考勤类型
         /// </summary>

performance/Performance.DtoModels/Response/AttendanceStatistics.cs

@@ -34,6 +34,10 @@ public class AttendanceStatistics
         /// </summary>
         public string PersonnelName { get; set; }
         /// <summary>
+        /// 人员系数
+        /// </summary>
+        public decimal? PermanentStaff { get; set; }
+        /// <summary>
         /// 在科开始时间
         /// </summary>
         public DateTime BeginDate { get; set; }

performance/Performance.EntityModels/Entity/per_attendance_issue.cs

@@ -46,6 +46,10 @@ public class per_attendance_issue
         /// </summary>
         public string PersonnelName { get; set; }
         /// <summary>
+        /// 人员系数
+        /// </summary>
+        public decimal? PermanentStaff { get; set; }
+        /// <summary>
         /// 在科开始时间
         /// </summary>
         public DateTime? BeginDate { get; set; }

performance/Performance.EntityModels/Entity/per_employee.cs

@@ -87,7 +87,7 @@ public class per_employee
         public Nullable<int> AttendanceDay { get; set; }
 
         /// <summary>
-        /// 核算人数
+        /// 人员系数
         /// </summary>
         public Nullable<decimal> PermanentStaff { get; set; }
 

performance/Performance.EntityModels/Other/view_attendance.cs

@@ -30,6 +30,10 @@ public class view_attendance
         /// </summary>
         public string PersonnelName { get; set; } 
         /// <summary>
+        /// 人员系数
+        /// </summary>
+        public decimal? PermanentStaff { get; set; } 
+        /// <summary>
         /// 考勤时间
         /// </summary>
         public DateTime AttendanceDate { get; set; }

performance/Performance.Services/ComputeConfig.cs

@@ -183,6 +183,7 @@ public static List<cof_alias> GetAllPersonnelTags(bool ownerQuery)
                 new cof_alias{ Alias = "出勤天数", Name = nameof(per_employee.AttendanceDay), States = 1, SumStatus = 0, Sort = 14 },
                 new cof_alias{ Alias = "预留比例", Name = nameof(per_employee.ReservedRatio), States = 1, SumStatus = 0, Sort = 16 },
                 new cof_alias{ Alias = "银行卡号", Name = nameof(per_employee.BankCard), States = 1, SumStatus = 0, Sort = 18 },
+                new cof_alias{ Alias = "人员系数", Name = nameof(per_employee.PermanentStaff), States = 0, SumStatus = 0, Sort = 19 },
 
                 new cof_alias{ Alias = "备用01", Name = nameof(per_employee.Reserve01), States = 0, SumStatus = 0, Sort = 20 },
                 new cof_alias{ Alias = "备用02", Name = nameof(per_employee.Reserve02), States = 0, SumStatus = 0, Sort = 20 },

performance/Performance.Services/DapperService.cs

@@ -434,5 +434,52 @@ public int UpdateAllotStates(int allotId, int states, string remark, int generat
                 throw;
             }
         }
+
+        /// <summary>
+        /// 查询考勤下发绩效视图(运行视图定义)
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <param name="unitType"></param>
+        /// <param name="accountingUnit"></param>
+        /// <param name="personnelName"></param>
+        /// <param name="personnelNumber"></param>
+        /// <returns></returns>
+        public IEnumerable<dynamic> QueryAttendanceIssue(int allotId, List<string> unitType, string accountingUnit, string personnelNameOrNumber)
+        {
+            try
+            {
+                using (var connection = new MySqlConnection(_options.Value.PerformanceConnectionString))
+                {
+                    if (connection.State != ConnectionState.Open) connection.Open();
+
+                    string sql = $@"select * from view_attendance_issue where allotID = @allotId";
+                    DynamicParameters parameters = new DynamicParameters();
+                    parameters.Add("@allotId", allotId);
+
+                    if (unitType?.Any() == true)
+                    {
+                        sql += " and unitType in @unitType";
+                        parameters.Add("@unitType", unitType);
+                    }
+                    if (!string.IsNullOrEmpty(accountingUnit))
+                    {
+                        sql += " and accountingUnit like @accountingUnit";
+                        parameters.Add("@accountingUnit", $"%{accountingUnit}%");
+                    }
+                    if (!string.IsNullOrEmpty(personnelNameOrNumber))
+                    {
+                        sql += " and (personnelNumber like @personnelNameOrNumber or personnelName like @personnelNameOrNumber)";
+                        parameters.Add("@personnelNameOrNumber", $"%{personnelNameOrNumber}%");
+                    } 
+
+                    return connection.Query(sql, parameters, commandTimeout: 60 * 60);
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError($"SQL执行异常：{ex}");
+                throw;
+            }
+        }
     }
 }