H5页面接口

performance/Performance.Api/Controllers/AllotController.cs

@@ -575,96 +575,7 @@ public ApiResponse GetOwnerMobilePerformance(string begin = "", string end = "")
                 throw new PerformanceException("您选择的时间范围无效");
 
             endDate = endDate.AddMonths(1);
-
-            List<OwnerMobilePerformanceDto> dtos = new List<OwnerMobilePerformanceDto>();
-
-            var datas = _allotService.GetOwnerPerformance(userid);
-
-            var groupDatas = datas
-                .Where(w => (new DateTime(w.Year, w.Month, 1)) >= beginDate && (new DateTime(w.Year, w.Month, 1)) < endDate)
-                .GroupBy(w => w.JobNumber);
-
-            foreach (var item in groupDatas)
-            {
-                var perforSumFee = new OwnerMobileItemDto
-                {
-                    Title = "业绩绩效",
-                    Amount = item.Sum(w => w.PerforSumFee) ?? 0,
-                    Details = item.SelectMany(w => w.Detail)
-                        .Where(w => (w.PerforSumFee ?? 0) != 0)
-                        .Select(w => new OwnerMobileItemDetailDto
-                        {
-                            Title = w.AccountingUnit,
-                            Amount = w.PerforSumFee ?? 0,
-                        }).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)
-                        .Select(w => new OwnerMobileItemDetailDto
-                        {
-                            Title = w.AccountingUnit,
-                            Amount = w.PerforManagementFee ?? 0,
-                        }).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)
-                        .Select(w => new OwnerMobileItemDetailDto
-                        {
-                            Title = w.AccountingUnit,
-                            Amount = w.NightWorkPerfor ?? 0,
-                        }).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)
-                        .Select(w => new OwnerMobileItemDetailDto
-                        {
-                            Title = w.SourceItem,
-                            Amount = w.OtherPerfor ?? 0,
-                        }).ToList()
-                };
-                var hideOtherPerfor = new OwnerMobileItemDto
-                {
-                    Title = "不公示其他绩效",
-                    Amount = item.Sum(w => w.HideOtherPerfor) ?? 0,
-                    Details = item.SelectMany(w => w.Detail)
-                        .Where(w => (w.HideOtherPerfor ?? 0) != 0)
-                        .Select(w => new OwnerMobileItemDetailDto
-                        {
-                            Title = w.SourceItem,
-                            Amount = w.HideOtherPerfor ?? 0,
-                        }).ToList()
-                };
-                var reservedRatioFee = new OwnerMobileItemDto
-                {
-                    Title = "预留绩效",
-                    Amount = item.Sum(w => w.ReservedRatioFee) ?? 0,
-                    Details = new List<OwnerMobileItemDetailDto>()
-                };
-
-                var dto = new OwnerMobilePerformanceDto { Total = item.Sum(w => w.RealGiveFee), Items = new List<OwnerMobileItemDto>() };
-                if (perforSumFee.Amount != 0) dto.Items.Add(perforSumFee);
-                if (perforManagementFee.Amount != 0) dto.Items.Add(perforManagementFee);
-                if (nightWorkPerfor.Amount != 0) dto.Items.Add(nightWorkPerfor);
-                if (otherPerfor.Amount != 0) dto.Items.Add(otherPerfor);
-                if (hideOtherPerfor.Amount != 0) dto.Items.Add(hideOtherPerfor);
-                if (reservedRatioFee.Amount != 0) dto.Items.Add(reservedRatioFee);
-
-                dtos.Add(dto);
-            }
-
-
+            var dtos = _allotService.GetOwnerMobilePerformance(userid, beginDate, endDate);
             return new ApiResponse(ResponseType.OK, dtos);
         }
     }

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

@@ -3594,6 +3594,11 @@
             实发绩效
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.OwnerPerformanceDto.IssueDate">
+            <summary>
+            发放时间
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.OwnerMobilePerformanceDto.Total">
             <summary>
             绩效发放总额

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

@@ -5940,6 +5940,11 @@
             是否修改过配置 1修改过 0未修改
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.per_allot.PigeonholeDate">
+            <summary>
+            归档日期
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.per_apr_amount">
             <summary>
             

performance/Performance.DtoModels/Response/OwnerPerformanceDto.cs

@@ -15,6 +15,10 @@ public class OwnerPerformanceDto : view_allot_result
         /// 实发绩效
         /// </summary>
         public decimal RealGiveFee { get; set; }
+        /// <summary>
+        /// 发放时间
+        /// </summary>
+        public string IssueDate { get; set; }
     }
 
 

performance/Performance.EntityModels/Entity/per_allot.cs

@@ -105,5 +105,9 @@ public class per_allot
         /// 是否修改过配置 1修改过 0未修改
         /// </summary>
         public int IsModifyConfig { get; set; }
+        /// <summary>
+        /// 归档日期
+        /// </summary>
+        public Nullable<DateTime> PigeonholeDate { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/per_batch.cs

@@ -39,7 +39,7 @@ public class per_batch
         /// <summary>
         /// 批次日期
         /// </summary>
-        public DateTime BatchDate { get; set; }
+        public Nullable<DateTime> BatchDate { get; set; }
         public string BankName { get; set; }
 
         /// <summary>

performance/Performance.Repository/PerforReportRepository .cs

@@ -393,7 +393,7 @@ public List<EmployeeReservedDto> GetEmployeeReserved(int hospitalId, int year)
 
         public List<view_allot_result> GetOwnerPerformance(List<int> hospitalId, string jobNumber)
         {
-            string sql = "SELECT * FROM view_allot_result WHERE States = 8 AND HospitalID IN @HospitalID AND JobNumber=@JobNumber";
+            string sql = "SELECT * FROM view_allot_result WHERE States IN (6,8) AND HospitalID IN @HospitalID AND JobNumber=@JobNumber";
             return DapperQuery<view_allot_result>(sql, new { HospitalID = hospitalId, JobNumber = jobNumber })?.ToList();
         }