考勤记录接口修复bug，实发绩效对比接口返回增加字段，新增非HandsonTable格式的获取人员标签配置接口

performance/Performance.Api/Controllers/AttendanceController.cs

@@ -148,9 +148,10 @@ public ApiResponse GetAttendanceVacationHandsonTable(int allotId)
         /// 查询考勤记录
         /// </summary>
         /// <param name="allotId"></param>
+        /// <param name="hospitalId"></param>
         /// <returns></returns>
-        [HttpGet("Vacation/{allotId}")]
-        public ApiResponse<List<RecordAttendcance>> GetAttendanceVacation(int allotId)
+        [HttpGet("Vacation/{allotId},{hospitalId}")]
+        public ApiResponse<List<RecordAttendcance>> GetAttendanceVacation(int allotId, int hospitalId)
         {
             return _attendanceService.GetAttendanceVacation(allotId);
         }

performance/Performance.Api/Controllers/ReportGlobalController.cs

@@ -146,6 +146,28 @@ public ApiResponse ReportPersonTag(int hospitalId, int allotId)
         }
 
         /// <summary>
+        /// 获取人员标签配置
+        /// </summary>
+        /// <param name="hospitalId"></param>
+        /// <param name="allotId"></param>
+        /// <returns></returns>
+        [Route("GetReportPersonTag")]
+        [HttpPost]
+        public ApiResponse GetReportPersonTag(int hospitalId, int allotId)
+        {
+            if (hospitalId <= 0)
+            {
+                return new ApiResponse(ResponseType.Fail, "参数错误", "hospitalId无效");
+            }
+            var relust = reportGlobalService.GetReportPersonTag(hospitalId, allotId);
+            return new ApiResponse(ResponseType.OK, new 
+            {
+                relust.ColHeaders,
+                relust.Data
+            });
+        }
+
+        /// <summary>
         /// 保存科室标签配置
         /// </summary>
         /// <param name="hospitalId"></param>

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

@@ -333,11 +333,12 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AttendanceController.GetAttendanceVacation(System.Int32)">
+        <member name="M:Performance.Api.Controllers.AttendanceController.GetAttendanceVacation(System.Int32,System.Int32)">
             <summary>
             查询考勤记录
             </summary>
             <param name="allotId"></param>
+            <param name="hospitalId"></param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.AttendanceController.AttendanceBatch(System.Int32,System.Int32,Performance.DtoModels.SaveCollectData)">
@@ -2007,6 +2008,14 @@
             <param name="allotId"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.ReportGlobalController.GetReportPersonTag(System.Int32,System.Int32)">
+            <summary>
+            获取人员标签配置
+            </summary>
+            <param name="hospitalId"></param>
+            <param name="allotId"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.ReportGlobalController.SaveReportPersonTag(System.Int32,System.Int32,Performance.DtoModels.SaveCollectData)">
             <summary>
             保存科室标签配置

performance/Performance.EntityModels/Other/view_check_dept.cs

@@ -23,6 +23,9 @@ public class view_check_dept
 
     public class view_check_emp : view_check_dept
     {
+        public int UnitTypeId { get; set; }
+        public int AccountID { get; set; }
+
         public string JobNumber { get; set; }
         public string EmployeeName { get; set; }
     }

performance/Performance.Services/EmployeeService.cs

@@ -1226,6 +1226,10 @@ public ComparisonResponse<DtoModels.Comparison<view_check_emp>> GetComparison(Co
             {
                 result.Heads = ComparisonConfig.DeptHeads;
                 result.Datas = peremployeeRepository.CheckAccountingUnitRealGiveFeeDiff(request);
+                result.Datas.Datas.ForEach(t =>
+                {
+                    t.UnitTypeId = EnumHelper.GetItems<UnitType>().FirstOrDefault(e => e.Name == t.UnitType).Value;
+                });
             }
             else if (request.ViewName == "view_check_emp")
             {