Groups/QueryVisaByDiId(签证费用列表)、Groups/CustomersByDiId(保险费用列表) 新增返回字段 payName(支付方式)

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -6927,19 +6927,14 @@ FROM
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> QueryVisaByDiId(VisaPriceDto dto)
         {
-            try
-            {
-                Result groupData = await _visaPriceRep.PostVisaByDiId(dto);
-                if (groupData.Code != 0)
-                {
-                    return Ok(JsonView(false, groupData.Msg));
-                }
-                return Ok(JsonView(true, groupData.Msg, groupData.Data));
-            }
-            catch (Exception ex)
+            
+            Result groupData = await _visaPriceRep.PostVisaByDiId(dto);
+            if (groupData.Code != 0)
             {
-                return Ok(JsonView(false, ex.Message));
+                return Ok(JsonView(false, groupData.Msg));
             }
+            return Ok(JsonView(true, groupData.Msg, groupData.Data));
+
         }
         /// <summary>
         /// 根据签证费用Id查询单条数据及c表数据
@@ -12664,19 +12659,12 @@ ORDER by  gctggrc.id DESC
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> CustomersByDiId(CustomersByDiIdDto dto)
         {
-            try
-            {
-                Result groupData = await _customersRep.CustomersByDiId(dto);
-                if (groupData.Code != 0)
-                {
-                    return Ok(JsonView(false, groupData.Msg));
-                }
-                return Ok(JsonView(true, groupData.Msg, groupData.Data));
-            }
-            catch (Exception ex)
+            Result groupData = await _customersRep.CustomersByDiId(dto);
+            if (groupData.Code != 0)
             {
-                return Ok(JsonView(false, ex.Message));
+                return Ok(JsonView(false, groupData.Msg));
             }
+            return Ok(JsonView(true, groupData.Msg, groupData.Data));
         }
         /// <summary>
         /// 根据保险费用Id查询保险费用详细

OASystem/OASystem.Domain/ViewModels/Groups/CustomersView.cs

@@ -56,6 +56,8 @@ namespace OASystem.Domain.ViewModels.Groups
         /// 是否审核Str
         /// </summary>
         public string IsAuditGMStr { get; set; }
+
+        public string PayName { get; set; }
     }
 
     public class CustomersByIdView

OASystem/OASystem.Domain/ViewModels/Groups/VisaInfoView.cs

@@ -55,6 +55,8 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public string VisaDescription { get; set; }
         public int IsPay { get; set; }
+
+        public string PayName { get; set; }
     }
 
 }

OASystem/OASystem.Infrastructure/Repositories/Groups/CustomersRepository.cs

@@ -38,208 +38,206 @@ namespace OASystem.Infrastructure.Repositories.Groups
         public async Task<Result> CustomersByDiId(CustomersByDiIdDto dto)
         {
             Result result = new Result() { Code = -2, Msg = "未知错误" };
-            try
+           
+            string UserId = "";
+            List<Grp_GroupsTaskAssignment> gtaUIdList = _sqlSugar.Queryable<Grp_GroupsTaskAssignment>().Where(a => a.DIId == dto.DiId && a.IsDel == 0 && a.CTId == 82).ToList();
+            foreach (Grp_GroupsTaskAssignment gta in gtaUIdList)
+                UserId += gta.UId + ",";
+
+            if (!string.IsNullOrWhiteSpace(UserId))
+            {
+                UserId = UserId.Substring(0, UserId.Length - 1);
+            }
+            else
             {
-                string UserId = "";
-                List<Grp_GroupsTaskAssignment> gtaUIdList = _sqlSugar.Queryable<Grp_GroupsTaskAssignment>().Where(a => a.DIId == dto.DiId && a.IsDel == 0 && a.CTId == 82).ToList();
-                foreach (Grp_GroupsTaskAssignment gta in gtaUIdList)
-                    UserId += gta.UId + ",";
+                UserId = "0";
+            }
+            string sqlWhere = string.Format(@"Where h.DiId={0} and h.IsDel={1} And h.CreateUserId in ({2})", dto.DiId, 0, UserId);
 
-                if (!string.IsNullOrWhiteSpace(UserId))
-                {
-                    UserId = UserId.Substring(0, UserId.Length - 1);
-                }
-                else
+            int startIndex = (dto.PageIndex - 1) * dto.PageSize + 1;
+            int endIndex = startIndex + dto.PageSize - 1;
+            if (dto.PortType == 1)
+            {
+                string sql = string.Format(@"select h.Id,h.ClientName,InsuranceCosts,Currency,s.Name as CurrencyStr,Attachment,c.OrbitalPrivateTransfer,
+                                                    u.CnName,c.IsAuditGM,s1.Name As 'PayName'
+                                                From Grp_Customers h 
+                                                Join Grp_CreditCardPayment c on h.Id=c.CId and c.CTable=82 and c.isdel=0
+                                                Left Join Sys_SetData s on  h.Currency=s.Id
+                                                Left Join Sys_Users u on u.Id=h.CreateUserId 
+                                                Left Join Sys_SetData s1 on c.PayDId = s1.Id {0}
+                                                Order by c.IsAuditGM,c.PayPercentage,h.CreateTime desc", sqlWhere);
+                List<CustomersView> Customers = _sqlSugar.SqlQueryable<CustomersView>(sql).ToList();
+
+                var parseIntValue = 0;
+                var CrmIds = (from item in Customers
+                                where item.ClientName.Contains(",") || int.TryParse(item.ClientName, out parseIntValue)
+                                select item.ClientName).ToList();
+                var strCrmIds = string.Join(',', CrmIds);
+                List<Crm_DeleClient> clietArr = new List<Crm_DeleClient>();
+                if (!string.IsNullOrWhiteSpace(strCrmIds))
                 {
-                    UserId = "0";
+                    sql = string.Format("SELECT * FROM Crm_DeleClient cdc where id in ({0}) and IsDel  = 0", strCrmIds);
+                    clietArr = _sqlSugar.SqlQueryable<Crm_DeleClient>(sql).ToList();
                 }
-                string sqlWhere = string.Format(@"Where h.DiId={0} and h.IsDel={1} And h.CreateUserId in ({2})", dto.DiId, 0, UserId);
 
-                int startIndex = (dto.PageIndex - 1) * dto.PageSize + 1;
-                int endIndex = startIndex + dto.PageSize - 1;
-                if (dto.PortType == 1)
+                foreach (var item in Customers)
                 {
-                    string sql = string.Format(@"select h.Id,h.ClientName,InsuranceCosts,Currency,s.Name as CurrencyStr,Attachment,c.OrbitalPrivateTransfer,u.CnName,c.IsAuditGM
-                                                    From Grp_Customers h 
-                                                    Join Grp_CreditCardPayment c on h.Id=c.CId and c.CTable=82 and c.isdel=0
-                                                    left Join Sys_SetData s on  h.Currency=s.Id
-                                                    left Join Sys_Users u on u.Id=h.CreateUserId {0} order by c.IsAuditGM,c.PayPercentage,h.CreateTime desc", sqlWhere);
-                    List<CustomersView> Customers = _sqlSugar.SqlQueryable<CustomersView>(sql).ToList();
-
-                    var parseIntValue = 0;
-                    var CrmIds = (from item in Customers
-                                  where item.ClientName.Contains(",") || int.TryParse(item.ClientName, out parseIntValue)
-                                  select item.ClientName).ToList();
-                    var strCrmIds = string.Join(',', CrmIds);
-                    List<Crm_DeleClient> clietArr = new List<Crm_DeleClient>();
-                    if (!string.IsNullOrWhiteSpace(strCrmIds))
-                    {
-                        sql = string.Format("SELECT * FROM Crm_DeleClient cdc where id in ({0}) and IsDel  = 0", strCrmIds);
-                        clietArr = _sqlSugar.SqlQueryable<Crm_DeleClient>(sql).ToList();
-                    }
-
-                    foreach (var item in Customers)
-                    {
-                        if (item.IsAuditGM == 0) item.IsAuditGMStr = "未审核";
-                        else if (item.IsAuditGM == 1) item.IsAuditGMStr = "已通过";
-                        else if (item.IsAuditGM == 2) item.IsAuditGMStr = "未通过";
-                        else if (item.IsAuditGM == 3) item.IsAuditGMStr = "自动审核";
+                    if (item.IsAuditGM == 0) item.IsAuditGMStr = "未审核";
+                    else if (item.IsAuditGM == 1) item.IsAuditGMStr = "已通过";
+                    else if (item.IsAuditGM == 2) item.IsAuditGMStr = "未通过";
+                    else if (item.IsAuditGM == 3) item.IsAuditGMStr = "自动审核";
 
-                        if (item.OrbitalPrivateTransfer == 0) item.OrbitalPrivateTransferStr = "公转";
-                        else if (item.OrbitalPrivateTransfer == 1) item.OrbitalPrivateTransferStr = "私转";
+                    if (item.OrbitalPrivateTransfer == 0) item.OrbitalPrivateTransferStr = "公转";
+                    else if (item.OrbitalPrivateTransfer == 1) item.OrbitalPrivateTransferStr = "私转";
 
-                        if (item.ClientName.Contains(","))
+                    if (item.ClientName.Contains(","))
+                    {
+                        var splitArr = item.ClientName.Split(',');
+                        var name = string.Empty;
+                        foreach (var client in splitArr)
                         {
-                            var splitArr = item.ClientName.Split(',');
-                            var name = string.Empty;
-                            foreach (var client in splitArr)
+                            if (int.TryParse(client, out parseIntValue))
                             {
-                                if (int.TryParse(client, out parseIntValue))
-                                {
-                                    var clientObject = clietArr.Find(x => x.Id == parseIntValue);
-                                    name += (clientObject?.LastName + clientObject?.FirstName + " ");
-                                }
+                                var clientObject = clietArr.Find(x => x.Id == parseIntValue);
+                                name += (clientObject?.LastName + clientObject?.FirstName + " ");
                             }
-
-                            if (!string.IsNullOrWhiteSpace(name))
-                            {
-                                item.ClientName = name;
-                            }
-                            continue;
                         }
-                        if (int.TryParse(item.ClientName, out parseIntValue))
-                        {
-                            var name = string.Empty;
-                            var clientObject = clietArr.Find(x => x.Id == parseIntValue);
-                            name += (clientObject?.LastName + clientObject?.FirstName);
 
-                            if (!string.IsNullOrWhiteSpace(name))
-                            {
-                                item.ClientName = name;
-                            }
-                            continue;
+                        if (!string.IsNullOrWhiteSpace(name))
+                        {
+                            item.ClientName = name;
                         }
+                        continue;
                     }
-
-                    if (!string.IsNullOrWhiteSpace(dto.ClientName))
+                    if (int.TryParse(item.ClientName, out parseIntValue))
                     {
-                        Customers = Customers.Where(x => x.ClientName.Contains(dto.ClientName)).ToList();
+                        var name = string.Empty;
+                        var clientObject = clietArr.Find(x => x.Id == parseIntValue);
+                        name += (clientObject?.LastName + clientObject?.FirstName);
+
+                        if (!string.IsNullOrWhiteSpace(name))
+                        {
+                            item.ClientName = name;
+                        }
+                        continue;
                     }
+                }
 
-                    return result = new Result() { Code = 0, Msg = "查询成功！", Data = Customers };
+                if (!string.IsNullOrWhiteSpace(dto.ClientName))
+                {
+                    Customers = Customers.Where(x => x.ClientName.Contains(dto.ClientName)).ToList();
+                }
+
+                return result = new Result() { Code = 0, Msg = "查询成功！", Data = Customers };
+            }
+            else if (dto.PortType == 2 || dto.PortType == 3)
+            {
+                string sql = string.Format(@"Select * From (	
+                                            Select row_number() over (order by c.IsAuditGM,c.PayPercentage,h.CreateTime desc) as RowNumber,h.Id,h.ClientName,InsuranceCosts,
+                                            Currency,s.Name as CurrencyStr,Attachment,c.OrbitalPrivateTransfer,u.CnName,c.IsAuditGM,s1.Name As 'PayName'
+                                            From Grp_Customers h 
+                                            Join Grp_CreditCardPayment c on h.Id=c.CId and c.CTable=82 and c.isdel=0
+                                            Left Join Sys_SetData s on  h.Currency=s.Id  
+                                            Left Join Sys_Users u on u.Id=h.CreateUserId  
+                                            Left Join Sys_SetData s1 on c.PayDId = s1.Id {0}
+                                            ) temp Where RowNumber Between {1} and {2}", sqlWhere, startIndex, endIndex);
+
+                List<CustomersView> Customers = _sqlSugar.SqlQueryable<CustomersView>(sql).ToList();
+
+                var parseIntValue = 0;
+                var CrmIds = (from item in Customers
+                                where item.ClientName.Contains(",") || int.TryParse(item.ClientName, out parseIntValue)
+                                select item.ClientName).ToList();
+                var strCrmIds = string.Join(',', CrmIds);
+                List<Crm_DeleClient> clietArr = new List<Crm_DeleClient>();
+                if (!string.IsNullOrWhiteSpace(strCrmIds))
+                {
+                    sql = string.Format("SELECT * FROM Crm_DeleClient cdc where id in ({0}) and IsDel  = 0", strCrmIds);
+                    clietArr = _sqlSugar.SqlQueryable<Crm_DeleClient>(sql).ToList();
                 }
-                else if (dto.PortType == 2 || dto.PortType == 3)
+
+                foreach (var item in Customers)
                 {
-                    string sql = string.Format(@"Select * From (	
-                                                Select row_number() over (order by c.IsAuditGM,c.PayPercentage,h.CreateTime desc) as RowNumber,h.Id,h.ClientName,InsuranceCosts,
-                                                Currency,s.Name as CurrencyStr,Attachment,c.OrbitalPrivateTransfer,u.CnName,c.IsAuditGM
-                                                From Grp_Customers h 
-                                                Join Grp_CreditCardPayment c on h.Id=c.CId and c.CTable=82 and c.isdel=0
-                                                left Join Sys_SetData s on  h.Currency=s.Id  
-                                                left Join Sys_Users u on u.Id=h.CreateUserId  {0}
-                                                ) temp Where RowNumber Between {1} and {2}", sqlWhere, startIndex, endIndex);
-
-                    List<CustomersView> Customers = _sqlSugar.SqlQueryable<CustomersView>(sql).ToList();
-
-                    var parseIntValue = 0;
-                    var CrmIds = (from item in Customers
-                                  where item.ClientName.Contains(",") || int.TryParse(item.ClientName, out parseIntValue)
-                                  select item.ClientName).ToList();
-                    var strCrmIds = string.Join(',', CrmIds);
-                    List<Crm_DeleClient> clietArr = new List<Crm_DeleClient>();
-                    if (!string.IsNullOrWhiteSpace(strCrmIds))
-                    {
-                        sql = string.Format("SELECT * FROM Crm_DeleClient cdc where id in ({0}) and IsDel  = 0", strCrmIds);
-                        clietArr = _sqlSugar.SqlQueryable<Crm_DeleClient>(sql).ToList();
-                    }
+                    if (item.IsAuditGM == 0) item.IsAuditGMStr = "未审核";
+                    else if (item.IsAuditGM == 1) item.IsAuditGMStr = "已通过";
+                    else if (item.IsAuditGM == 2) item.IsAuditGMStr = "未通过";
+                    else if (item.IsAuditGM == 3) item.IsAuditGMStr = "自动审核";
 
-                    foreach (var item in Customers)
-                    {
-                        if (item.IsAuditGM == 0) item.IsAuditGMStr = "未审核";
-                        else if (item.IsAuditGM == 1) item.IsAuditGMStr = "已通过";
-                        else if (item.IsAuditGM == 2) item.IsAuditGMStr = "未通过";
-                        else if (item.IsAuditGM == 3) item.IsAuditGMStr = "自动审核";
+                    if (item.OrbitalPrivateTransfer == 0) item.OrbitalPrivateTransferStr = "公转";
+                    else if (item.OrbitalPrivateTransfer == 1) item.OrbitalPrivateTransferStr = "私转";
 
-                        if (item.OrbitalPrivateTransfer == 0) item.OrbitalPrivateTransferStr = "公转";
-                        else if (item.OrbitalPrivateTransfer == 1) item.OrbitalPrivateTransferStr = "私转";
 
+                    if (item.ClientName.Contains(","))
+                    {
+                        var splitArr = item.ClientName.Split(',');
+                        var name = string.Empty;
+                        var i = 0;
 
-                        if (item.ClientName.Contains(","))
+                        while (i < splitArr.Count())
                         {
-                            var splitArr = item.ClientName.Split(',');
-                            var name = string.Empty;
-                            var i = 0;
-
-                            while (i < splitArr.Count())
+                            if (int.TryParse(splitArr[i], out parseIntValue))
                             {
-                                if (int.TryParse(splitArr[i], out parseIntValue))
-                                {
-                                    var clientObject = clietArr.Find(x => x.Id == parseIntValue);
-                                    name += (clientObject?.LastName + clientObject?.FirstName);
-                                }
-
-                                i++;
-
-                                if (i < splitArr.Count())
-                                {
-                                    name += "[*TuT*]";
-                                }
+                                var clientObject = clietArr.Find(x => x.Id == parseIntValue);
+                                name += (clientObject?.LastName + clientObject?.FirstName);
                             }
 
-                            if (!string.IsNullOrWhiteSpace(name))
+                            i++;
+
+                            if (i < splitArr.Count())
                             {
-                                item.ClientName = name.TrimEnd();
+                                name += "[*TuT*]";
                             }
-
-                            continue;
                         }
 
-                        if (int.TryParse(item.ClientName, out parseIntValue))
+                        if (!string.IsNullOrWhiteSpace(name))
                         {
-                            var name = string.Empty;
-                            var clientObject = clietArr.Find(x => x.Id == parseIntValue);
-                            name += (clientObject?.LastName + clientObject?.FirstName);
-
-                            if (!string.IsNullOrWhiteSpace(name))
-                            {
-                                item.ClientName = name;
-                            }
-                            continue;
+                            item.ClientName = name.TrimEnd();
                         }
 
+                        continue;
+                    }
+
+                    if (int.TryParse(item.ClientName, out parseIntValue))
+                    {
+                        var name = string.Empty;
+                        var clientObject = clietArr.Find(x => x.Id == parseIntValue);
+                        name += (clientObject?.LastName + clientObject?.FirstName);
+
+                        if (!string.IsNullOrWhiteSpace(name))
+                        {
+                            item.ClientName = name;
+                        }
+                        continue;
                     }
-                    string CountSql = string.Format(@"Select COUNT(1) as Count From (	
-                                                    select h.Id,h.ClientName,InsuranceCosts,Currency,s.Name as CurrencyStr,Attachment,c.OrbitalPrivateTransfer,u.CnName,c.IsAuditGM
-                                                    From Grp_Customers h 
-                                                    Join Grp_CreditCardPayment c on h.Id=c.CId and c.CTable=82 and c.isdel=0
-                                                    left Join Sys_SetData s on  h.Currency=s.Id  
-                                                    left Join Sys_Users u on u.Id=h.CreateUserId   {0}
-                                                    ) temp", sqlWhere);
-                    DataCount dataCount = _sqlSugar.SqlQueryable<DataCount>(CountSql).First();
-
-                    int count = dataCount.Count;
-                    float totalPage = (float)count / dto.PageSize;//总页数
-                    if (totalPage == 0) totalPage = 1;
-                    else totalPage = (int)Math.Ceiling((double)totalPage);
-
-                    ListViewBase<CustomersView> rst = new ListViewBase<CustomersView>();
-                    rst.DataList = Customers;
-                    rst.DataCount = count;
-                    rst.CurrPageIndex = dto.PageIndex;
-                    rst.CurrPageSize = dto.PageSize;
-                    return result = new Result() { Code = 0, Msg = "查询成功！", Data = rst };
 
                 }
-                else
-                {
-                    return result = new Result() { Code = -2, Msg = "请传入PortType参数,1 Web 2 Android 3 IOS" };
-                }
+                string CountSql = string.Format(@"Select COUNT(1) as Count From (	
+                                                select h.Id,h.ClientName,InsuranceCosts,Currency,s.Name as CurrencyStr,Attachment,c.OrbitalPrivateTransfer,u.CnName,c.IsAuditGM
+                                                From Grp_Customers h 
+                                                Join Grp_CreditCardPayment c on h.Id=c.CId and c.CTable=82 and c.isdel=0
+                                                left Join Sys_SetData s on  h.Currency=s.Id  
+                                                left Join Sys_Users u on u.Id=h.CreateUserId   {0}
+                                                ) temp", sqlWhere);
+                DataCount dataCount = _sqlSugar.SqlQueryable<DataCount>(CountSql).First();
+
+                int count = dataCount.Count;
+                float totalPage = (float)count / dto.PageSize;//总页数
+                if (totalPage == 0) totalPage = 1;
+                else totalPage = (int)Math.Ceiling((double)totalPage);
+
+                ListViewBase<CustomersView> rst = new ListViewBase<CustomersView>();
+                rst.DataList = Customers;
+                rst.DataCount = count;
+                rst.CurrPageIndex = dto.PageIndex;
+                rst.CurrPageSize = dto.PageSize;
+                return result = new Result() { Code = 0, Msg = "查询成功！", Data = rst };
+
             }
-            catch (Exception ex)
+            else
             {
-                return result = new Result() { Code = -2, Msg = "未知错误" };
-                throw;
+                return result = new Result() { Code = -2, Msg = "请传入PortType参数,1 Web 2 Android 3 IOS" };
             }
+           
         }
 
         public async Task<Result> CustomersById(CustomersByIdDto dto)

OASystem/OASystem.Infrastructure/Repositories/Groups/VisaPriceRepository.cs

@@ -91,8 +91,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     //                            (select Name from Sys_SetData where isdel=0 and v.VisaCurrency=Id) VisaCurrencyStr from
                     //                            Grp_VisaInfo v {0} order by CreateTime desc",sqlWhere);
 
-                    string sql = string.Format(@"  Select v.*, c.IsAuditGM,c.IsPay
-From Grp_VisaInfo as v With(Nolock) left Join Grp_CreditCardPayment as c With(Nolock) On v.Id = c.CId
+                    string sql = string.Format(@"  Select v.*, c.IsAuditGM,c.IsPay,sd.Name As 'PayName' From Grp_VisaInfo as v With(Nolock) 
+left Join Grp_CreditCardPayment as c With(Nolock) On v.Id = c.CId
+Left Join Sys_SetData as sd With(Nolock) On c.PayDId = sd.Id 
 {0}
  And c.CTable = 80 And c.IsDel = 0   ", sqlWhere);
 
@@ -188,10 +189,11 @@ From Grp_VisaInfo as v With(Nolock) left Join Grp_CreditCardPayment as c With(No
                 else if (dto.PortType == 2 || dto.PortType == 3)
                 {
                     string sql = string.Format(@"Select * From (	
-                                            Select row_number() over (order by v.Id Desc) as RowNumber,v.*,c.IsAuditGM,s.Name as VisaCurrencyStr
+                                            Select row_number() over (order by v.Id Desc) as RowNumber,v.*,c.IsAuditGM,s.Name as VisaCurrencyStr,s1.Name As 'PayName'
                                             From Grp_VisaInfo v
-                                            left Join Grp_CreditCardPayment c On v.Id = c.CId and CTable=80 and c.isdel=0
-                                            Left Join Sys_SetData s On v.VisaCurrency = s.Id {0}
+                                            Left Join Grp_CreditCardPayment c On v.Id = c.CId and CTable=80 and c.isdel=0
+                                            Left Join Sys_SetData s On v.VisaCurrency = s.Id 
+                                            Left Join Sys_SetData s1 On c.PayDId = s1.Id {0}
                                             ) temp Where RowNumber Between {1} and {2}", sqlWhere, startIndex, endIndex);
 
                     List<VisaInfoView> infoViews = _sqlSugar.SqlQueryable<VisaInfoView>(sql).ToList();