执行优化

performance/Performance.Api/Controllers/AllotController.cs

@@ -565,7 +565,7 @@ public ApiResponse GetOwnerPerformance()
         /// <returns></returns>
         [Route("owner/query/mobile")]
         [HttpGet]
-        public ApiResponse GetOwnerMobilePerformance(string begin = "", string end = "")
+        public ApiResponse<List<OwnerMobilePerformanceDto>> GetOwnerMobilePerformance(string begin = "", string end = "")
         {
             var userid = _claim.GetUserId();
             var beginDate = begin.ToTryDateTime();
@@ -576,7 +576,7 @@ public ApiResponse GetOwnerMobilePerformance(string begin = "", string end = "")
 
             endDate = endDate.AddMonths(1);
             var dtos = _allotService.GetOwnerMobilePerformance(userid, beginDate, endDate);
-            return new ApiResponse(ResponseType.OK, dtos);
+            return new ApiResponse<List<OwnerMobilePerformanceDto>>(ResponseType.OK, dtos);
         }
     }
 }

performance/Performance.Api/Controllers/EmployeeController.cs

@@ -301,7 +301,7 @@ public ApiResponse GetAprGroupList([FromBody] AllotIdRequest request)
                     Amount = t.Sum(s => s.Amount ?? 0),
                     Status = t.Any(s => s.Status == 2) ? 2 : t.Any(s => s.Status == 4) ? 4 : t.FirstOrDefault().Status,
                     AuditTime = t.Any(s => s.Status == 2) ? "" : t.Max(w => w.AuditTime)?.ToString("yyyy-MM-dd HH:mm:ss"),
-                    Remark = t.Any(s => !s.MarkStatus.HasValue) ? "" : $"已审计({t.Max(w => w.MarkTime)?.ToString("yyyy-MM-dd HH:mm:ss")})"
+                    Remark = t.Any(s => !s.MarkStatus.HasValue) ? "" : $"已审计{t.Max(w => w.MarkTime)?.ToString("(yyyy-MM-dd HH:mm:ss)")}"
                 });
             return new ApiResponse(ResponseType.OK, "ok", result);
         }
@@ -603,7 +603,7 @@ public ApiResponse GetAprHideGroupList([FromBody] AllotIdRequest request)
                     Amount = t.Sum(s => s.Amount ?? 0),
                     Status = t.Any(s => s.Status == 2) ? 2 : t.Any(s => s.Status == 4) ? 4 : t.FirstOrDefault().Status,
                     AuditTime = t.Any(s => s.Status == 2) ? "" : t.Max(w => w.AuditTime)?.ToString("yyyy-MM-dd HH:mm:ss"),
-                    Remark = t.Any(s => !s.MarkStatus.HasValue) ? "" : $"已审计({t.Max(w => w.MarkTime)?.ToString("yyyy-MM-dd HH:mm:ss")})"
+                    Remark = t.Any(s => !s.MarkStatus.HasValue) ? "" : $"已审计{t.Max(w => w.MarkTime)?.ToString("(yyyy-MM-dd HH:mm:ss)")}"
                 });
             return new ApiResponse(ResponseType.OK, "ok", result);
         }

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -373,7 +373,7 @@ public ApiResponse<List<ag_secondallot>> AuditList([FromBody] AllotDeptRequest r
             var list = secondAllotService.AuditList(request.AllotId);
             foreach (var item in list)
             {
-                item.Remark += item.MarkStatus.HasValue ? " " : $" 已审计({item.MarkTime?.ToString("yyyy-MM-dd HH:mm:ss")})";
+                item.Remark += item.MarkStatus.HasValue && item.MarkStatus == 1 ? $" 已审计{item.MarkTime?.ToString("(yyyy-MM-dd HH:mm:ss)")}" : "";
             }
 
             return new ApiResponse<List<ag_secondallot>>(ResponseType.OK, "审核列表", list);

performance/Performance.Services/EmployeeService.cs

@@ -600,17 +600,8 @@ public ApiResponse AprMark(int userid, AprAmountMarkRequest request)
             var allApramounts = perapramountRepository.GetEntities(t => t.AllotId == request.AllotId);
             foreach (var department in request.TypeInDepartments)
             {
-                var apramounts = allApramounts?.Where(t => t.TypeInDepartment == department);
-                if (apramounts != null && apramounts.Any())
-                {
-                    foreach (var item in apramounts)
-                    {
-                        item.MarkStatus = 1;
-                        item.MarkUser = userid;
-                        item.MarkTime = DateTime.Now;
-                        perapramountRepository.UpdateRange(apramounts.ToArray());
-                    }
-                }
+                string update = "update per_apr_amount set MarkStatus=@MarkStatus,MarkUser=@MarkUser,MarkTime=@MarkTime where TypeInDepartment=@TypeInDepartment and AllotId=@AllotId; ";
+                perapramountRepository.Execute(update, new { MarkStatus = 1, MarkUser = userid, MarkTime = DateTime.Now, TypeInDepartment = department, request.AllotId });
             }
             return new ApiResponse(ResponseType.OK, "");
         }
@@ -1055,20 +1046,10 @@ public ApiResponse AprMarkHide(int userid, AprAmountMarkRequest request)
             if (request?.TypeInDepartments == null || !request.TypeInDepartments.Any())
                 throw new PerformanceException("审计信息无效，请确认");
 
-            var allApramounts = _hideRepository.GetEntities(t => t.AllotId == request.AllotId);
             foreach (var department in request.TypeInDepartments)
             {
-                var apramounts = allApramounts?.Where(t => t.TypeInDepartment == department);
-                if (apramounts != null && apramounts.Any())
-                {
-                    foreach (var item in apramounts)
-                    {
-                        item.MarkStatus = 1;
-                        item.MarkUser = userid;
-                        item.MarkTime = DateTime.Now;
-                        _hideRepository.UpdateRange(apramounts.ToArray());
-                    }
-                }
+                string update = "update per_apr_amount_hide set MarkStatus=@MarkStatus,MarkUser=@MarkUser,MarkTime=@MarkTime where TypeInDepartment=@TypeInDepartment and AllotId=@AllotId; ";
+                _hideRepository.Execute(update, new { MarkStatus = 1, MarkUser = userid, MarkTime = DateTime.Now, TypeInDepartment = department, request.AllotId });
             }
             return new ApiResponse(ResponseType.OK, "");
         }