Merge branch 'feature/实发绩效校验' into feature/用于合并

performance/Performance.Api/Controllers/EmployeeController.cs

@@ -736,6 +736,22 @@ public ApiResponse GetDeptComparison([FromBody] ComparisonPagingRequest request)
             return new ApiResponse(ResponseType.OK, relust);
         }
 
+        /// <summary>
+        /// 实发绩效校验
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <returns></returns>
+        [Route("getDeptComparisonTotal/{allotId}")]
+        [HttpPost]
+        public ApiResponse GetDeptComparisonTotal([FromRoute] int allotId)
+        {
+            var allot = allotService.GetAllot(allotId);
+            if (allot == null)
+                return new ApiResponse(ResponseType.ParameterError, "allotId无效");
+
+            var relust = employeeService.GetDeptComparisonTotal(allotId);
+            return new ApiResponse(ResponseType.OK, relust);
+        }
         #region 手工录入
 
         /// <summary>

performance/Performance.Api/appsettings.Localhost.json

@@ -8,7 +8,7 @@
   },
   "AppConnection": {
     //"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
-    "PerformanceConnectionString": "server=192.168.18.166;database=db_performance_screen;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
+    "PerformanceConnectionString": "server=192.168.18.166;database=db_test_liangzhou;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
     "HangfireConnectionString": "server=192.168.18.166;database=db_hangfire;uid=root;pwd=1234qwer;port=3306;allow user variables=true;",
     "RedisConnectionString": "116.62.245.55:6379,defaultDatabase=2"
   },

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

@@ -1190,6 +1190,13 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetDeptComparisonTotal(System.Int32)">
+            <summary>
+            实发绩效校验
+            </summary>
+            <param name="allotId"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetGatherDrop(System.Int32)">
             <summary>
             手工录入 - 下拉列表

performance/Performance.DtoModels/Response/ComparisonResponse.cs

@@ -4,10 +4,10 @@
 
 namespace Performance.DtoModels
 {
-    public class ComparisonResponse
+    public class ComparisonResponse<T>
     {
         public List<Heads> Heads { get; set; }
-        public Comparison Datas { get; set; }
+        public T Datas { get; set; }
     }
 
     public class Heads
@@ -16,9 +16,9 @@ public class Heads
         public string Name { get; set; }
     }
 
-    public class Comparison
+    public class Comparison<T>
     {
-        public List<view_check_emp> Datas { get; set; }
+        public List<T> Datas { get; set; }
         public int TotalCount { get; set; }
 
     }

performance/Performance.EntityModels/Other/view_check_dept.cs

@@ -26,8 +26,16 @@ public class view_check_emp : view_check_dept
         public string JobNumber { get; set; }
         public string EmployeeName { get; set; }
     }
+
+    public class DeptComparisonTotal
+    {
+        public string UnitType { get; set; }
+        public int Count { get; set; }
+        public decimal?  SumFee{ get; set; }
+    }
 }
 
 
 
 
+

performance/Performance.Repository/PerforPeremployeeRepository.cs

@@ -67,7 +67,7 @@ public PageList<ex_result_gather> GetGatherForPaging(int pageNumber, int pageSiz
         /// <param name="allotId"></param>
         /// <param name="searchQuery"></param>
         /// <returns></returns>
-        public Comparison CheckEmployeeRealGiveFeeDiff(int allotId, string searchQuery)
+        public DtoModels.Comparison<view_check_emp> CheckEmployeeRealGiveFeeDiff(int allotId, string searchQuery)
         {
             var queryData = @"
 SELECT 
@@ -91,7 +91,7 @@ public Comparison CheckEmployeeRealGiveFeeDiff(int allotId, string searchQuery)
 ) TAB 
 WHERE if(@searchQuery='','',AccountingUnit) LIKE @parm OR if(@searchQuery='','',JobNumber) LIKE @parm OR if(@searchQuery='','',EmployeeName) LIKE @parm
 ";
-            return new Comparison()
+            return new DtoModels.Comparison<view_check_emp>()
             {
                 Datas = DapperQuery<view_check_emp>(queryData, new { allotId, searchQuery, parm = $"%{searchQuery}%" })?.ToList() ?? new List<view_check_emp>(),
                 TotalCount = DapperQuery<int>(queryCount, new { allotId, searchQuery, parm = $"%{searchQuery}%" })?.FirstOrDefault() ?? 0,
@@ -101,7 +101,7 @@ public Comparison CheckEmployeeRealGiveFeeDiff(int allotId, string searchQuery)
         /// <summary>
         /// 科室实发绩效比对
         /// </summary>
-        public Comparison CheckAccountingUnitRealGiveFeeDiff(int allotId, string searchQuery)
+        public DtoModels.Comparison<view_check_emp> CheckAccountingUnitRealGiveFeeDiff(int allotId, string searchQuery)
         {
             var queryData = @"
 SELECT *,IFNULL(RealGiveFeeExecl,0) - IFNULL(RealGiveFeeCompute,0) AS Diff FROM (
@@ -119,13 +119,31 @@ public Comparison CheckAccountingUnitRealGiveFeeDiff(int allotId, string searchQ
 ) TAB 
 WHERE if(@searchQuery='','',AccountingUnit) LIKE @parm
 ";
-            return new Comparison()
+            return new DtoModels.Comparison<view_check_emp>()
             {
                 Datas = DapperQuery<view_check_emp>(queryData, new { allotId, searchQuery, parm = $"%{searchQuery}%" })?.ToList() ?? new List<view_check_emp>(),
                 TotalCount = DapperQuery<int>(queryCount, new { allotId, searchQuery, parm = $"%{searchQuery}%" })?.FirstOrDefault() ?? 0,
             };
         }
 
+        /// <summary>
+        /// 实发绩效校验
+        /// </summary>
+        public DtoModels.Comparison<DeptComparisonTotal> CheckView_check_deptUnitRealGiveFeeDiffTotal(int allotId)
+        {
+            var queryData = @"SELECT UnitType,Count(1) Count,Sum(RealGiveFeeCompute) SumFee FROM 
+                (SELECT *,IFNULL(RealGiveFeeExecl,0) - IFNULL(RealGiveFeeCompute,0) AS Diff FROM (
+                	SELECT * FROM view_check_dept_account UNION ALL
+                	SELECT * FROM view_check_dept_specialunit
+                ) TAB 
+                ORDER BY HospitalId,Year,Month,ABS(DIFF) DESC )view_check_dept
+                where AllotID = @allotId and Diff <> 0 GROUP BY UnitType";
+            return new DtoModels.Comparison<DeptComparisonTotal>()
+            {
+                Datas = DapperQuery<DeptComparisonTotal>(queryData, new { allotId })?.ToList() ?? new List<DeptComparisonTotal>(),
+            };
+        }
+
         public IDbConnection GetDbConnection()
         {
             return context.Database.GetDbConnection();

performance/Performance.Services/EmployeeService.cs

@@ -1123,9 +1123,9 @@ public List<TitleValue> GetPerforTypeDictHide(int allotId)
         }
         #endregion
 
-        public ComparisonResponse GetComparison(ComparisonPagingRequest request)
+        public ComparisonResponse<DtoModels.Comparison<view_check_emp>> GetComparison(ComparisonPagingRequest request)
         {
-            var result = new ComparisonResponse();
+            var result = new ComparisonResponse<DtoModels.Comparison<view_check_emp>>();
 
             if (request.ViewName == "view_check_dept")
             {
@@ -1139,12 +1139,21 @@ public ComparisonResponse GetComparison(ComparisonPagingRequest request)
             }
             else
             {
-                result.Datas = new Comparison { Datas = new List<view_check_emp>(), TotalCount = 0 };
+                result.Datas = new DtoModels.Comparison<view_check_emp> { Datas = new List<view_check_emp>(), TotalCount = 0 };
             }
             //result.Datas = peremployeeRepository.GetComparison(request);
             return result;
         }
 
+        public ComparisonResponse<DtoModels.Comparison<DeptComparisonTotal>> GetDeptComparisonTotal(int AllotId)
+        {
+            var result = new ComparisonResponse<DtoModels.Comparison<DeptComparisonTotal>>();
+            result.Heads = ComparisonConfig.DeptTotalHeads;
+            result.Datas = peremployeeRepository.CheckView_check_deptUnitRealGiveFeeDiffTotal(AllotId);
+
+            return result;
+        }
+
         #region 手工数据录入
 
         public List<GatherDropResponse> GetGatherDrop(int allotId)
@@ -1490,5 +1499,12 @@ public class ComparisonConfig
             new Heads{Column="软件实发",Name=nameof(view_check_emp.RealGiveFeeCompute)},
             new Heads{Column="差额",Name=nameof(view_check_emp.Diff)},
         };
+
+        public static List<Heads> DeptTotalHeads { get; } = new List<Heads>
+        {
+            new Heads{Column="分类",Name=nameof(view_check_dept.UnitType)},
+            new Heads{Column="实发不一致",Name="Count"},
+            new Heads{Column="总额",Name="SumFee"},
+        };
     }
 }