Merge branch 'feature/新二次分配' into release/v20210709功能分支合并

performance/Performance.EntityModels/Entity/ag_bodysource.cs

@@ -150,5 +150,10 @@ public class ag_bodysource
         /// 实发绩效(参考，含医院其他绩效)
         /// </summary>
         public Nullable<decimal> ReferToRealAmount { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
     }
 }

performance/Performance.Services/RedistributionService.cs

@@ -97,6 +97,9 @@ public SecondDetailDto Load(int secondId, ComputeMode computeMode, EmployeeSourc
             // 先占位，更加选择加载指定范围数据
             // 加载方式分 保存，上次，字典，测算表
             var loadEmployees = LoadEmployees(allot, second, overrideMode, out bool isSave);
+            // 保存后则不再设置默认值
+            if (!isSave)
+            {
                 // 设置固定信息默认值
                 foreach (var item in loadEmployees)
                 {
@@ -104,6 +107,7 @@ public SecondDetailDto Load(int secondId, ComputeMode computeMode, EmployeeSourc
                     item.ActualAttendance = item.ActualAttendance ?? DateTime.DaysInMonth(allot.Year, allot.Month);  // 出勤
                     item.TitleCoefficient = item.TitleCoefficient ?? 1;  // 职称系数
                 }
+            }
 
             // 加载已保存工作量数据
             handson.Data = LoadWorkload(allot, second, loadEmployees, isSave);
@@ -359,8 +363,10 @@ public List<SecondColumnDictionary> GetTableHeaderDictionary(ComputeMode compute
         /// <summary>
         /// 按指定方式加载人员数据
         /// </summary>
-        /// <param name="secondId"></param>
+        /// <param name="allot"></param>
+        /// <param name="second"></param>
         /// <param name="mode"></param>
+        /// <param name="isSave">true 保存 false 未保存</param>
         /// <returns></returns>
         private List<ag_bodysource> LoadEmployees(per_allot allot, ag_secondallot second, EmployeeSource mode, out bool isSave)
         {
@@ -617,7 +623,10 @@ private HandsonTableBase ComputeMode_Format1(List<string> colHeaders, List<Hands
             handson.Columns.AddRange(columns);
 
             handson.ColHeaders.AddRange(new string[] { "夜班绩效", });
-            handson.Columns.AddRange(new HandsonColumn[] { new HandsonColumn(nameof(ag_bodysource.NightWorkPerformance).ToLower(), format: DataFormat.小数), });
+            handson.Columns.AddRange(new HandsonColumn[] { new HandsonColumn(nameof(ag_bodysource.NightWorkPerformance).ToLower(), format: DataFormat.小数) });
+
+            handson.ColHeaders.AddRange(new string[] { "备注", });
+            handson.Columns.AddRange(new HandsonColumn[] { new HandsonColumn(nameof(ag_bodysource.Remark).ToLower()) });
 
             return handson;
         }
@@ -648,8 +657,10 @@ private HandsonTableBase ComputeMode_Format2(List<string> colHeaders, List<Hands
             handson.Columns.AddRange(columns);
 
             handson.ColHeaders.AddRange(new string[] { "夜班绩效", });
-            handson.Columns.AddRange(new HandsonColumn[] { new HandsonColumn(nameof(ag_bodysource.NightWorkPerformance).ToLower(), format: DataFormat.小数), });
+            handson.Columns.AddRange(new HandsonColumn[] { new HandsonColumn(nameof(ag_bodysource.NightWorkPerformance).ToLower(), format: DataFormat.小数) });
 
+            handson.ColHeaders.AddRange(new string[] { "备注", });
+            handson.Columns.AddRange(new HandsonColumn[] { new HandsonColumn(nameof(ag_bodysource.Remark).ToLower()) });
             return handson;
         }