Merge branch 'feature/抽取时添加抽取时间' into develop

performance/Performance.Api/Controllers/ConfigController.cs

@@ -534,7 +534,7 @@ public ApiResponse DepttypeDelete([CustomizeValidator(RuleSet = "Delete"), FromB
         public ApiResponse GetAccountingList([FromBody] AccoungingRequest request)
         {
             var enumItems = EnumHelper.GetItems<AccountTypeEnum>();
-            if (request.AllotId == 0 || !enumItems.Select(t => t.Value).Contains(request.Type))
+            if ((request.AllotId == 0 && request.HospitalId == 0) || !enumItems.Select(t => t.Value).Contains(request.Type))
                 return new ApiResponse(ResponseType.ParameterError);
 
             var result = _configService.GetAccountingList(request);

performance/Performance.Api/Controllers/TemplateController.cs

@@ -221,9 +221,10 @@ public ApiResponse NewExtractData([CustomizeValidator, FromBody] ExtractRequest
                 //检验科室、费用类型是否需要补充
 
                 allot.IsExtracting = allot.IsExtracting ?? 0;
-                if (allot.IsExtracting == 1)
+                if (allot.IsExtracting == 1 && allot.ExtractTime.HasValue && DateTime.Now.AddHours(-3) < allot.ExtractTime)
                     return new ApiResponse(ResponseType.OK, "正在提取数据，请稍等！", new { IsExtracting = true });
                 allot.IsExtracting = 1;
+                allot.ExtractTime = DateTime.Now;
                 allotService.Update(allot);
                 string email = claim.GetUserClaim(JwtClaimTypes.Mail);
 

performance/Performance.Api/Properties/PublishProfiles/FolderProfile.pubxml

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
-此文件由 Web 项目的发布/打包过程使用。可以通过编辑此 MSBuild 文件
-自定义此过程的行为。为了解与此相关的更多内容，请访问 https://go.microsoft.com/fwlink/?LinkID=208121。 
+https://go.microsoft.com/fwlink/?LinkID=208121. 
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-    <PublishProvider>FileSystem</PublishProvider>
+    <DeleteExistingFiles>True</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>bin\Release\netcoreapp2.2\publish\</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
     <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <ProjectGuid>3ae00ff5-f0ba-4d72-a23b-770186309327</ProjectGuid>
     <SelfContained>false</SelfContained>
-    <_IsPortable>true</_IsPortable>
-    <publishUrl>D:\publish\jx.suvalue.com2</publishUrl>
-    <DeleteExistingFiles>True</DeleteExistingFiles>
   </PropertyGroup>
 </Project>
\ No newline at end of file

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

@@ -1829,6 +1829,11 @@
             绩效Id
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.AccoungingRequest.HospitalId">
+            <summary>
+            绩效Id
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.AccoungingRequest.Type">
             <summary>
             1 返回accounting列表 2 返回核算单元类型 3 返回核算单元

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

@@ -4306,6 +4306,11 @@
             是否在抽取数据0 否、1 是、2 抽取成功、3 抽取失败
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.per_allot.ExtractTime">
+            <summary>
+            数据抽取起始时间
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.per_allot.Generate">
             <summary>
             1、人事科提交重新生成 2、生成成功 3、原始数据修改

performance/Performance.DtoModels/Request/AccoungingRequest.cs

@@ -8,6 +8,11 @@ public class AccoungingRequest
         public int AllotId { get; set; }
 
         /// <summary>
+        /// 绩效Id
+        /// </summary>
+        public int HospitalId { get; set; }
+
+        /// <summary>
         /// 1 返回accounting列表 2 返回核算单元类型 3 返回核算单元
         /// </summary>
         public int Type { get; set; }

performance/Performance.EntityModels/Entity/per_allot.cs

@@ -80,7 +80,12 @@ public class per_allot
         /// 是否在抽取数据0 否、1 是、2 抽取成功、3 抽取失败
         /// </summary>
         public Nullable<int> IsExtracting { get; set; }
-    
+
+        /// <summary>
+        /// 数据抽取起始时间
+        /// </summary>
+        public Nullable<DateTime> ExtractTime { get; set; }
+
         /// <summary>
         /// 1、人事科提交重新生成 2、生成成功 3、原始数据修改
         /// </summary>

performance/Performance.Services/ConfigService.cs

@@ -645,6 +645,14 @@ public bool AgainDelete(CofAgainRequest request)
         public List<cof_accounting> GetAccountingList(AccoungingRequest request)
         {
             Expression<Func<cof_accounting, bool>> exp = t => t.AllotId == request.AllotId;
+            if (request.AllotId == 0)
+            {
+                var allots = perforPerAllotRepository.GetEntities(t => t.HospitalId == request.HospitalId);
+                if (allots == null || !allots.Any())
+                    throw new PerformanceException("请先配置科室信息");
+                exp = t => allots.Select(a => a.ID).Contains(t.AllotId);
+            }
+
             if (request.Type == (int)AccountTypeEnum.AccountingUnit && !string.IsNullOrEmpty(request.UnitType))
                 exp = exp.And(t => t.UnitType == request.UnitType);
 
@@ -730,7 +738,7 @@ public HandsonTable GetBatchAccountingStructrue(int AllotId)
         public bool BatchSaveAccounting(int allotId, SaveCollectData request)
         {
             var dicData = CreateDataRow(0, allotId, request, Accounting);
-            var getAccounts = cofaccountingRepository.GetEntities();
+            var getAccounts = cofaccountingRepository.GetEntities(t => t.AllotId == allotId);
             var unitType = EnumHelper.GetItems<UnitType>().Select(w => w.Description.Replace("行政后勤", "行政工勤")).ToArray();
             List<cof_accounting> accounts = new List<cof_accounting>();
             foreach (var item in dicData)

performance/Performance.Services/SecondAllot/SecondAllotDetails.cs

@@ -824,7 +824,7 @@ private void SupplementSecondDetail(ag_secondallot second, List<per_employee> em
                 }
                 // 必须是相同核算单元类型才能带出医院其他绩效
                 if (second.UnitType.Replace("其他", "").Replace("医技", "医生")
-                    == empl.UnitType.Replace("其他", "").Replace("医技", "医生"))
+                    == empl?.UnitType.Replace("其他", "").Replace("医技", "医生"))
                 {
                     if (second.UnitType == UnitType.行政后勤.ToString())
                     {

performance/Performance.Services/SecondAllot/SecondAllotService.cs

@@ -55,6 +55,8 @@ public SecondAllotResponse GetSecondSavedData(int userId, int secondId, int empl
                     Workload_Ratio_Default = 0.8m,
                     DaysFullAttendance = DateTime.DaysInMonth(allot.Year, allot.Month)
                 };
+            head.TotalDistPerformance = second.RealGiveFee;
+            head.PaymentOfTheMonth = $"{allot.Year}年{allot.Month.ToString().PadLeft(2, '0')}月";
             JObject jObject = JObject.Parse(JsonConvert.SerializeObject(head));
             var headDynamic = agworktypesourceRepository.GetEntities(t => t.SecondId == secondId);
             if (headDynamic != null && headDynamic.Any())

performance/Performance.Services/SecondAllotService.cs

@@ -1572,14 +1572,14 @@ public bool AuditSubmit(ag_secondallot second, int userId)
             if (temp == null)
                 throw new PerformanceException("选择模板不可用，请确定模板及数据是否存在！");
 
-            //bool method(decimal? submitDataAmount, decimal? realGiveFee)
-            //{
-            //    if (!submitDataAmount.HasValue || !realGiveFee.HasValue)
-            //        return false;
+            bool VerifySubmissioAmount(decimal? submitDataAmount, decimal? realGiveFee)
+            {
+                if (!submitDataAmount.HasValue || !realGiveFee.HasValue)
+                    return false;
 
-            //    decimal floatValue = 0.5m;
-            //    return submitDataAmount >= (realGiveFee - floatValue) && submitDataAmount <= (realGiveFee + floatValue);
-            //}
+                decimal floatValue = 0.1m;
+                return submitDataAmount >= (realGiveFee - floatValue) && submitDataAmount <= (realGiveFee + floatValue);
+            }
 
             if (temp.UseTempId == 6)
             {
@@ -1587,9 +1587,9 @@ public bool AuditSubmit(ag_secondallot second, int userId)
                 if (data == null || !data.Any())
                     throw new PerformanceException("提交时未检测到数据!");
 
-                //var total = data.Sum(t => t.RealAmount);
-                //if (!method(total, second.RealGiveFee))
-                //    throw new PerformanceException("总金额与考核后金额不一致！");
+                var total = data.Sum(t => t.DistPerformance + t.NightWorkPerformance);   // 其他模板 = 可分配绩效 + 夜班绩效
+                if (!VerifySubmissioAmount(total, second.RealGiveFee))
+                    throw new PerformanceException($"总金额与考核后金额不一致！可分配金额：{second.RealGiveFee}，提交金额：{total}");
             }
             else if (new int[] { 7, 8 }.Contains(temp.UseTempId.Value))
             {
@@ -1597,16 +1597,20 @@ public bool AuditSubmit(ag_secondallot second, int userId)
                 if (data == null || !data.Any())
                     throw new PerformanceException("提交时未检测到数据!");
 
-                //var total = data.Where(t => t.ItemName == "实发绩效工资金额" && t.RowNumber > -1).GroupBy(t => t.RowNumber)
-                //    .Sum(t => ConvertHelper.To<decimal>(t.OrderByDescending(o => o.ID).FirstOrDefault().ItemValue));
-                //if (!method(total, second.RealGiveFee))
-                //    throw new PerformanceException("总金额与考核后金额不一致！");
+                var total = data.Where(t => new string[] { "可分配绩效", "夜班工作量绩效" }.Contains(t.ItemName) && t.RowNumber > -1).GroupBy(t => t.RowNumber)
+                    .Sum(t => ConvertHelper.To<decimal>(t.OrderByDescending(o => o.ID).FirstOrDefault().ItemValue));
+                if (!VerifySubmissioAmount(total, second.RealGiveFee))
+                    throw new PerformanceException($"总金额与考核后金额不一致！可分配金额：{second.RealGiveFee}，提交金额：{total}");
             }
             else if (new int[] { 9, 10 }.Contains(temp.UseTempId.Value))
             {
                 var data = agbodysourceRepository.GetEntities(t => t.SecondId == second.Id);
                 if (data == null || !data.Any())
                     throw new PerformanceException("提交时未检测到数据!");
+
+                var total = data.Sum(t => t.DistPerformance + t.NightWorkPerformance);
+                if (!VerifySubmissioAmount(total, second.RealGiveFee))
+                    throw new PerformanceException($"总金额与考核后金额不一致！可分配金额：{second.RealGiveFee}，提交金额：{total}");
             }
             second.UseTempId = temp.UseTempId;
             second.Status = 2;