二次分配提交

performance/Performance.Repository/PerforAgsecondallotRepository.cs

@@ -44,10 +44,10 @@ public List<view_second_compute_collect> GetComputeBySecond(int secondId)
             return new List<view_second_compute_collect>();
         }
 
-        public int Submit(int secondId, int tempId, decimal realGiveFee, string remark = "")
+        public int Submit(int secondId, int tempId, decimal realGiveFee, int submitType, string remark = "")
         {
-            string sql = "UPDATE ag_secondallot SET UseTempId = @tempId,NursingDeptStatus = @status, Status = @status, SubmitTime = @date, Remark = @remark WHERE Id = @secondId AND RealGiveFee = @fee";
-            return Execute(sql, new { secondId, tempId, status = 2, date = DateTime.Now, fee = realGiveFee, remark });
+            string sql = "UPDATE ag_secondallot SET UseTempId = @tempId,NursingDeptStatus = @status, Status = @status, SubmitType = @submitType,SubmitTime = @date, Remark = @remark WHERE Id = @secondId AND RealGiveFee = @fee";
+            return Execute(sql, new { secondId, tempId, status = 2, date = DateTime.Now, fee = realGiveFee, submitType, remark });
         }
     }
 }

performance/Performance.Services/SecondAllotService.cs

@@ -1621,8 +1621,8 @@ bool VerifySubmissioAmount(decimal? leftAmount, decimal? rightAmount)
                 if (!VerifySubmissioAmount(total, second.RealGiveFee))
                     throw new PerformanceException($"总金额与考核后金额不一致！可分配金额：{second.RealGiveFee}，提交金额：{total}");
 
-
-                var res = agsecondallotRepository.Submit(second.Id, temp.UseTempId ?? 0, total);
+                var submitType = temp.UseTempId == 6 ? 2 : 1;
+                var res = agsecondallotRepository.Submit(second.Id, temp.UseTempId ?? 0, total, submitType);
                 if (res == 0)
                     throw new PerformanceException($"提交失败，当前绩效分配可能发生改变！");
                 return true;
@@ -1638,7 +1638,8 @@ bool VerifySubmissioAmount(decimal? leftAmount, decimal? rightAmount)
                 if (!VerifySubmissioAmount(total, second.RealGiveFee))
                     throw new PerformanceException($"总金额与考核后金额不一致！可分配金额：{second.RealGiveFee}，提交金额：{total}");
 
-                var res = agsecondallotRepository.Submit(second.Id, temp.UseTempId ?? 0, total);
+                var submitType = temp.UseTempId == 6 ? 2 : 1;
+                var res = agsecondallotRepository.Submit(second.Id, temp.UseTempId ?? 0, total, submitType);
                 if (res == 0)
                     throw new PerformanceException($"提交失败，当前绩效分配可能发生改变请刷新后重试！");
                 return true;
@@ -1658,7 +1659,8 @@ bool VerifySubmissioAmount(decimal? leftAmount, decimal? rightAmount)
                         throw new PerformanceException($"总金额与考核后金额不一致！可分配金额：{second.RealGiveFee:0.####}，提交金额：{total:0.####}");
                     else
                     {
-                        var res = agsecondallotRepository.Submit(second.Id, temp.UseTempId ?? 0, total);
+                        var submitType = temp.UseTempId == 6 ? 2 : 1;
+                        var res = agsecondallotRepository.Submit(second.Id, temp.UseTempId ?? 0, total, submitType);
                         if (res == 0)
                             throw new PerformanceException($"提交失败，当前绩效分配可能发生改变，请刷新后重试！");
                         return true;
@@ -1670,7 +1672,7 @@ bool VerifySubmissioAmount(decimal? leftAmount, decimal? rightAmount)
             //second.UseTempId = temp.UseTempId;
             //second.Status = 2;
             //second.NursingDeptStatus = 2;
-            ////second.SubmitType = temp.UseTempId == 6 ? 2 : 1;
+            //second.SubmitType = temp.UseTempId == 6 ? 2 : 1;
             //second.SubmitTime = DateTime.Now;
             //second.Remark = "已提交审核，等待审核中";
             //return agsecondallotRepository.Update(second); 
@@ -2455,17 +2457,17 @@ private List<SecondPerforResponse> GetAllotPerformance(int allotId, List<res_com
                     ShouldGiveFee = t.ShouldGiveFee,
                 };
 
-            // 行政中层  行政高层 补充  夜班费
-            if (types2.Contains(t.AccountType))
+                // 行政中层  行政高层 补充  夜班费
+                if (types2.Contains(t.AccountType))
                     comp.NightWorkPerfor = t.NightWorkPerfor;
 
-            // 科主任/护士长
-            if (types1.Contains(t.AccountType))
+                // 科主任/护士长
+                if (types1.Contains(t.AccountType))
                 {
-                // 等同于考核后管理绩效 AssessLaterManagementFee
-                comp.PerforManagementFee = Math.Round(t.ShouldGiveFee * t.ScoreAverageRate * t.Attendance + t.Punishment ?? 0);
-                // 仅显示管理绩效
-                if (isShowManage == 2)
+                    // 等同于考核后管理绩效 AssessLaterManagementFee
+                    comp.PerforManagementFee = Math.Round(t.ShouldGiveFee * t.ScoreAverageRate * t.Attendance + t.Punishment ?? 0);
+                    // 仅显示管理绩效
+                    if (isShowManage == 2)
                         comp.PerforSumFee = 0;
                     else
                         comp.PerforSumFee = t.Avg;