个人绩效查询取消登录验证

performance/Performance.Api/Controllers/AllotController.cs

@@ -560,14 +560,15 @@ public ApiResponse GetOwnerPerformance()
         /// <summary>
         /// H5查询个人绩效
         /// </summary>
+        /// <param name="jobNumber">员工工号</param>
         /// <param name="begin">开始月份：2021-03</param>
         /// <param name="end">结束月份：2021-04</param>
         /// <returns></returns>
         [Route("owner/query/mobile")]
         [HttpGet]
-        public ApiResponse<List<OwnerMobilePerformanceDto>> GetOwnerMobilePerformance(string begin = "", string end = "")
+        [AllowAnonymous]
+        public ApiResponse<List<OwnerMobilePerformanceDto>> GetOwnerMobilePerformance(string jobNumber = "", string begin = "", string end = "")
         {
-            var userid = _claim.GetUserId();
             var beginDate = begin.ToTryDateTime();
             var endDate = end.ToTryDateTime();
 
@@ -575,7 +576,7 @@ public ApiResponse<List<OwnerMobilePerformanceDto>> GetOwnerMobilePerformance(st
                 throw new PerformanceException("您选择的时间范围无效");
 
             endDate = endDate.AddMonths(1);
-            var dtos = _allotService.GetOwnerMobilePerformance(userid, beginDate, endDate);
+            var dtos = _allotService.GetOwnerMobilePerformance(jobNumber, beginDate, endDate);
             return new ApiResponse<List<OwnerMobilePerformanceDto>>(ResponseType.OK, dtos);
         }
     }

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

@@ -338,10 +338,11 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AllotController.GetOwnerMobilePerformance(System.String,System.String)">
+        <member name="M:Performance.Api.Controllers.AllotController.GetOwnerMobilePerformance(System.String,System.String,System.String)">
             <summary>
             H5查询个人绩效
             </summary>
+            <param name="jobNumber">员工工号</param>
             <param name="begin">开始月份：2021-03</param>
             <param name="end">结束月份：2021-04</param>
             <returns></returns>

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

@@ -8945,6 +8945,16 @@
             费用
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.view_other_amount.UnitType">
+            <summary>
+            核算单元组别
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.view_other_amount.AccountingUnit">
+            <summary>
+            核算单元
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.view_per_apr_amount.UnitType">
             <summary>
             核算单元组别

performance/Performance.DtoModels/Response/OwnerPerformanceDto.cs

@@ -50,6 +50,13 @@ public class OwnerMobileItemDto
     }
     public class OwnerMobileItemDetailDto
     {
+        public OwnerMobileItemDetailDto(string title, decimal amount, string date)
+        {
+            Title = title;
+            Amount = amount;
+            Date = date;
+        }
+
         /// <summary>
         /// 类型名称
         /// </summary>

performance/Performance.EntityModels/Other/view_allot_sign_emp.cs

@@ -2,10 +2,10 @@
 {
     public class view_allot_sign_emp_finance
     {
-        public string HospitalID { get; set; }
-        public string Year { get; set; }
-        public string Month { get; set; }
-        public string AllotId { get; set; }
+        public int HospitalID { get; set; }
+        public int Year { get; set; }
+        public int Month { get; set; }
+        public int AllotId { get; set; }
         public string JobNumber { get; set; }
         public string EmployeeName { get; set; }
         public string JobTitle { get; set; }
@@ -29,12 +29,14 @@ public class view_allot_sign_emp_finance
 
     public class view_allot_sign_emp : view_allot_sign_emp_finance
     {
-        public int Source { get; set; }
+        public string Source { get; set; }
         public int SecondId { get; set; }
         public int States { get; set; }
         public string IsShowManage { get; set; }
         public string Emp_UnitType { get; set; }
         public string Emp_AccountingUnit { get; set; }
         public string Batch { get; set; }
+        public string BatchDate { get; set; }
+        public string BankName { get; set; }
     }
 }

performance/Performance.EntityModels/Other/view_per_apr_amount.cs

@@ -2,6 +2,21 @@
 
 namespace Performance.EntityModels
 {
+    public class view_other_amount
+    {
+        public int AllotId { get; set; }
+        public string PersonnelNumber { get; set; }
+        /// <summary>
+        /// 核算单元组别
+        /// </summary>
+        public string UnitType { get; set; }
+        /// <summary>
+        /// 核算单元
+        /// </summary>
+        public string AccountingUnit { get; set; }
+        public string PerforType { get; set; }
+        public decimal Amount { get; set; }
+    }
     public class view_per_apr_amount : per_apr_amount
     {
         /// <summary>

performance/Performance.Repository/PerforReportRepository .cs

@@ -397,6 +397,34 @@ public List<view_allot_result> GetOwnerPerformance(List<int> hospitalId, string
             return DapperQuery<view_allot_result>(sql, new { HospitalID = hospitalId, JobNumber = jobNumber })?.ToList();
         }
 
+        public List<view_allot_sign_emp> GetOwnerPerformance(string jobNumber)
+        {
+            string sql = "SELECT * FROM freeze_allot_sign_emp WHERE (States = 8 OR IFNULL(Batch,'') != '') AND JobNumber=@JobNumber";
+            return DapperQuery<view_allot_sign_emp>(sql, new { JobNumber = jobNumber })?.ToList();
+        }
+
+        /// <summary>
+        /// 个人绩效查询 医院其他绩效
+        /// </summary>
+        /// <param name="jobNumber"></param>
+        /// <returns></returns>
+        public List<view_other_amount> GetOwnerOtherAmount(string jobNumber)
+        {
+            string sql = "SELECT * FROM view_other_amount WHERE Status = 3 AND PersonnelNumber = @JobNumber";
+            return DapperQuery<view_other_amount>(sql, new { JobNumber = jobNumber })?.ToList();
+        }
+
+        /// <summary>
+        /// 个人绩效查询 不公示其他绩效
+        /// </summary>
+        /// <param name="jobNumber"></param>
+        /// <returns></returns>
+        public List<view_other_amount> GetOwnerOtherAmountHide(string jobNumber)
+        {
+            string sql = "SELECT * FROM view_other_amount_hide WHERE Status = 3 AND PersonnelNumber = @JobNumber";
+            return DapperQuery<view_other_amount>(sql, new { JobNumber = jobNumber })?.ToList();
+        }
+
         public List<dynamic> QueryCompute(int allotId, string viewName)
         {
             var sql = $@"SELECT * FROM {viewName} WHERE   AllotId = @AllotId; ";

performance/Performance.Services/AllotService.cs

@@ -782,16 +782,14 @@ public List<OwnerPerformanceDto> GetOwnerPerformance(int userid)
         /// <param name="beginDate"></param>
         /// <param name="endDate"></param>
         /// <returns></returns>
-        public List<OwnerMobilePerformanceDto> GetOwnerMobilePerformance(int userid, DateTime beginDate, DateTime endDate)
+        public List<OwnerMobilePerformanceDto> GetOwnerMobilePerformance(string jobNumber, DateTime beginDate, DateTime endDate)
         {
             List<OwnerMobilePerformanceDto> dtos = new List<OwnerMobilePerformanceDto>();
-            var datas = GetOwnerPerformance(userid);
+            var datas = _reportRepository.GetOwnerPerformance(jobNumber) ?? new List<view_allot_sign_emp>();
+            var otherAmounts = _reportRepository.GetOwnerOtherAmount(jobNumber) ?? new List<view_other_amount>();
+            var otherAmountHides = _reportRepository.GetOwnerOtherAmountHide(jobNumber) ?? new List<view_other_amount>();
 
-            if (datas == null || datas.Count == 0)
-                return dtos;
-
-            var filterDatas = datas
-                .Where(w => (new DateTime(w.Year, w.Month, 1)) >= beginDate && (new DateTime(w.Year, w.Month, 1)) < endDate);
+            var filterDatas = datas.Where(w => (new DateTime(w.Year, w.Month, 1)) >= beginDate && (new DateTime(w.Year, w.Month, 1)) < endDate);
             var groupDatas = filterDatas.GroupBy(w => w.JobNumber);
 
             foreach (var item in groupDatas)
@@ -799,72 +797,55 @@ public List<OwnerMobilePerformanceDto> GetOwnerMobilePerformance(int userid, Dat
                 var perforSumFee = new OwnerMobileItemDto
                 {
                     Title = "业绩绩效",
-                    Amount = item.Sum(w => w.PerforSumFee) ?? 0,
-                    Details = item.SelectMany(w => w.Detail)
-                        .Where(w => (w.PerforSumFee ?? 0) != 0 && !string.IsNullOrEmpty(w.IssueDate))
-                        .Select(w => new OwnerMobileItemDetailDto
-                        {
-                            Title = w.AccountingUnit,
-                            Amount = w.PerforSumFee ?? 0,
-                            Date = w.IssueDate,
-                        }).ToList()
+                    Amount = item.Sum(w => w.PerforSumFee),
+                    Details = item
+                        .Where(w => (w.PerforSumFee) != 0)
+                        .Select(w => new OwnerMobileItemDetailDto(w.AccountingUnit, w.PerforSumFee, w.BatchDate)).ToList()
                 };
                 var perforManagementFee = new OwnerMobileItemDto
                 {
                     Title = "管理绩效",
-                    Amount = item.Sum(w => w.PerforManagementFee) ?? 0,
-                    Details = item.SelectMany(w => w.Detail)
-                        .Where(w => (w.PerforManagementFee ?? 0) != 0 && !string.IsNullOrEmpty(w.IssueDate))
-                        .Select(w => new OwnerMobileItemDetailDto
-                        {
-                            Title = w.AccountingUnit,
-                            Amount = w.PerforManagementFee ?? 0,
-                            Date = w.IssueDate,
-                        }).ToList()
+                    Amount = item.Sum(w => w.PerforManagementFee),
+                    Details = item
+                        .Where(w => w.PerforManagementFee != 0)
+                        .Select(w => new OwnerMobileItemDetailDto(w.AccountingUnit, w.PerforManagementFee, w.BatchDate)).ToList()
                 };
                 var nightWorkPerfor = new OwnerMobileItemDto
                 {
                     Title = "夜班绩效",
-                    Amount = item.Sum(w => w.NightWorkPerfor) ?? 0,
-                    Details = item.SelectMany(w => w.Detail)
-                        .Where(w => (w.NightWorkPerfor ?? 0) != 0 && !string.IsNullOrEmpty(w.IssueDate))
-                        .Select(w => new OwnerMobileItemDetailDto
-                        {
-                            Title = w.AccountingUnit,
-                            Amount = w.NightWorkPerfor ?? 0,
-                            Date = w.IssueDate,
-                        }).ToList()
+                    Amount = item.Sum(w => w.NightWorkPerfor),
+                    Details = item
+                        .Where(w => w.NightWorkPerfor != 0)
+                        .Select(w => new OwnerMobileItemDetailDto(w.AccountingUnit, w.NightWorkPerfor, w.BatchDate)).ToList()
                 };
                 var otherPerfor = new OwnerMobileItemDto
                 {
                     Title = "医院其他绩效",
-                    Amount = item.Sum(w => w.OtherPerfor) ?? 0,
-                    Details = item.SelectMany(w => w.Detail)
-                        .Where(w => (w.OtherPerfor ?? 0) != 0 && !string.IsNullOrEmpty(w.IssueDate))
-                        .Select(w => new OwnerMobileItemDetailDto
-                        {
-                            Title = w.SourceItem,
-                            Amount = w.OtherPerfor ?? 0,
-                            Date = w.IssueDate,
-                        }).ToList()
+                    Amount = item.Sum(w => w.OtherPerfor),
+                    Details = new List<OwnerMobileItemDetailDto>()
                 };
+                foreach (var p in item)
+                {
+                    var qt = otherAmounts.Where(w => w.AllotId == p.AllotId).Select(w => new OwnerMobileItemDetailDto(w.PerforType, w.Amount, p.BatchDate));
+                    if (qt.Any()) otherPerfor.Details.AddRange(qt);
+                }
+
                 var hideOtherPerfor = new OwnerMobileItemDto
                 {
                     Title = "不公示其他绩效",
-                    Amount = item.Sum(w => w.HideOtherPerfor) ?? 0,
-                    Details = item.SelectMany(w => w.Detail)
-                        .Where(w => (w.HideOtherPerfor ?? 0) != 0 && !string.IsNullOrEmpty(w.IssueDate))
-                        .Select(w => new OwnerMobileItemDetailDto
-                        {
-                            Title = w.SourceItem,
-                            Amount = w.HideOtherPerfor ?? 0,
-                            Date = w.IssueDate,
-                        }).ToList()
+                    Amount = item.Sum(w => w.HideOtherPerfor),
+                    Details = new List<OwnerMobileItemDetailDto>()
                 };
+                foreach (var p in item)
+                {
+                    var qt = otherAmountHides.Where(w => w.AllotId == p.AllotId).Select(w => new OwnerMobileItemDetailDto(w.PerforType, w.Amount, p.BatchDate));
+                    if (qt.Any()) hideOtherPerfor.Details.AddRange(qt);
+                }
+
                 var reservedRatioFee = new OwnerMobileItemDto
                 {
                     Title = "预留绩效",
-                    Amount = item.Sum(w => w.ReservedRatioFee) ?? 0,
+                    Amount = item.Sum(w => w.ReservedRatioFee),
                     Details = new List<OwnerMobileItemDetailDto>()
                 };