Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -5513,6 +5513,8 @@ Group by PriceType ", dto.diId);
         {
             var jw = JsonView(false);
 
+            var stateArr = new int[] { 0, 1 };
+
             if (!DateTime.TryParse(dto.StartDate, out DateTime StartDateTime))
             {
                 jw.Msg = "开始时间格式有误！";
@@ -5528,12 +5530,19 @@ Group by PriceType ", dto.diId);
                 jw.Msg = "开始时间大于结束时间！";
                 return Ok(jw);
             }
+            if (!stateArr.Contains(dto.Send) || !stateArr.Contains(dto.Confirm))
+            {
+                jw.Msg = "状态标识有误！";
+                return Ok(jw);
+            }
 
             var expressionSelectWhere = Expressionable.Create<Fin_RoyaltyConfirm>()
                     .And(it => it.VisitDate >= StartDateTime)
                     .And(it => it.VisitDate <= EndDateTime)
                     .And(it => it.IsDel == 0)
                     .And(it => it.UserId == dto.UserId)
+                    .And(it => it.IsConfirm == dto.Confirm)
+                    .And(it => it.IsSeed == dto.Send)
                     .ToExpression();
 
             try
@@ -5552,7 +5561,15 @@ Group by PriceType ", dto.diId);
                     x.IsSeed
                 });
 
-                jw = JsonView(true, "获取成功！", query);
+                jw = JsonView(true, "获取成功！", new
+                {
+                    List = query,
+                    CostPrice = query.Sum(x=>x.Price),
+                    ConfirmPrice = query.Where(x=>x.IsConfirm == 1).Sum(x=>x.Price),
+                    NoConfirmPrice = query.Where(x => x.IsConfirm == 0).Sum(x => x.Price),
+                    SeedPrice = query.Where(x => x.IsSeed == 1).Sum(x => x.Price),
+                    NoSeedPrice = query.Where(x => x.IsSeed == 0).Sum(x => x.Price),
+                });
             }
             catch (Exception ex)
             {

OASystem/OASystem.Domain/Dtos/Financial/ComputeRoyaltiesDto.cs

@@ -62,6 +62,10 @@ namespace OASystem.Domain.Dtos.Financial
         public int UserId { get; set; }
         public string StartDate { get; set; }
         public string EndDate { get; set; }
+
+        public int Confirm { get; set; }
+
+        public int Send { get; set; }
     }
 
     public class ComputeRoyaltiesView

OASystem/OASystem.Infrastructure/Repositories/CRM/NewClientDataRepository.cs

@@ -3,6 +3,7 @@ using AutoMapper.Execution;
 using MySqlX.XDevAPI.Relational;
 using NPOI.OpenXmlFormats.Dml.Diagram;
 using NPOI.SS.Formula.Functions;
+using NPOI.SS.UserModel;
 using OASystem.Domain;
 using OASystem.Domain.Dtos;
 using OASystem.Domain.Dtos.CRM;
@@ -47,19 +48,26 @@ namespace OASystem.Infrastructure.Repositories.CRM
             if (portType == 1 || portType == 2 || portType == 3)
             {
                 #region 下拉框初始化数据
-                //负责人下拉框
-                List<dynamic> _Users = new List<dynamic>();
-                List<Sys_Users> users = GetNewExistClient();
 
-                foreach (Sys_Users user in users)   
-                {
-                    var data = new
-                    {
-                        Id = user.Id,
-                        Name = user.CnName
-                    };
-                    _Users.Add(data);
-                };
+                //负责人下拉框
+                //List<dynamic> _Users = new List<dynamic>();
+
+                var _Users = _sqlSugar.Queryable<Sys_Users>().Where(x => x.IsDel == 0).Select(x => new
+                {
+                    x.Id,
+                    Name = x.CnName
+                }).ToList();
+
+                //List<Sys_Users> users = GetNewExistClient();
+                //foreach (Sys_Users user in users)   
+                //{
+                //    var data = new
+                //    {
+                //        Id = user.Id,
+                //        Name = user.CnName
+                //    };
+                //    _Users.Add(data);
+                //};
 
 
                 List<Sys_SetData> initData = _sqlSugar.Queryable<Sys_SetData>().Where(it => it.IsDel == 0).ToList();