二次绩效其他绩效数据保存

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -401,11 +401,11 @@ public ApiResponse NursingDeptAuditResult([FromBody] SecondAuditRequest request)
         [HttpPost]
         public ApiResponse OtherList([FromBody] AgOtherRequest request)
         {
-            var result = secondAllotService.OtherList(request.SecondId, claimService.GetUserId());
-            //var result = secondAllotDetails.GetOtherTempData(claimService.GetUserId(), request.SecondId, request.IsArchive, request.EmployeeSource, out decimal? realAmount);
+            //var result = secondAllotService.OtherList(request.SecondId, claimService.GetUserId());
+            var result = secondAllotDetails.GetOtherTempData(claimService.GetUserId(), request.SecondId, request.IsArchive, request.EmployeeSource, out decimal? realAmount);
             var obj = new
             {
-                header = secondAllotService.OtherListHeader(request.SecondId, result?.Sum(s => s.RealAmount) ?? 0),
+                header = secondAllotService.OtherListHeader(request.SecondId, realAmount),
                 body = result,
             };
             return new ApiResponse(ResponseType.OK, obj);
@@ -423,13 +423,19 @@ public ApiResponse OtherSave([FromBody] AgOtherRequest request)
             return new ApiResponse(ResponseType.OK, result);
         }
 
-        //[Route("api/second/other/save/{secondId}")]
-        //[HttpPost]
-        //public ApiResponse OtherSave(int secondId, [FromBody] SaveCollectData request)
-        //{
-        //    secondAllotService.OtherSave(secondId, request);
-        //    return new ApiResponse(ResponseType.OK);
-        //}
+        /// <summary>
+        /// 二次绩效其他绩效保存(new)
+        /// </summary>
+        /// <param name="secondId"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("api/second/other/save/{secondId}")]
+        [HttpPost]
+        public ApiResponse OtherSave(int secondId, [FromBody] SaveCollectData request)
+        {
+            secondAllotService.OtherSave(secondId, request);
+            return new ApiResponse(ResponseType.OK);
+        }
 
         #endregion 二次绩效其他绩效
 

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

@@ -1280,6 +1280,14 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.SecondAllotController.OtherSave(System.Int32,Performance.DtoModels.SaveCollectData)">
+            <summary>
+            二次绩效其他绩效保存(new)
+            </summary>
+            <param name="secondId"></param>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.SecondAllotController.SecondPrint(System.Int32)">
             <summary>
             二次绩效结果打印

performance/Performance.Services/SecondAllotService.cs

@@ -1700,14 +1700,20 @@ public void OtherSave(int secondId, SaveCollectData collectData)
             }
             if (parameters == null || !parameters.Any()) return;
 
-            List<string> josn = new List<string>();
+            List<Dictionary<string, object>> result = new List<Dictionary<string, object>>();
             foreach (var item in collectData.Data)
             {
                 var list = item.ToList();
-                var itemList = list.Select(t => $"\"{parameters[list.IndexOf(t)]}\":\"{t}\"");
-                josn.Add($"{{{string.Join(",", itemList)}}}");
+                Dictionary<string, object> dict = new Dictionary<string, object>();
+                parameters.ForEach(t =>
+                {
+                    dict.Add(t, list[parameters.IndexOf(t)]);
+                });
+                result.Add(dict);
             }
-            var data = JsonHelper.Deserialize<List<ag_othersource>>($"[{string.Join(",", josn)}]");
+
+            var json = JsonHelper.Serialize(result);
+            var data = JsonHelper.Deserialize<List<ag_othersource>>(json);
             data = data.Where(t => !string.IsNullOrEmpty(t.WorkNumber) || !string.IsNullOrEmpty(t.Name))?.ToList();
             if (data == null || !data.Any()) return;