最新备份20230819FX

leo

2023-08-19 ed40b3a565a0a52c3e98e47888c65e2df50eb9ea

最新备份20230819FX

 .vs/RiskControlRR/v15/Server/sqlite3/storage.ide

Binary files differ

 GasolineBlend.BLL/ChinaStockBLL.cs

@@ -3,6 +3,7 @@
using System.IO;
using System.Linq;
using System.Net;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
using CommonHelper;
@@ -46,6 +47,11 @@
        public List<ChinaStock> GetChinaStockList()
        {
            return _acc.GetChinaStockList();
        }

        public ChinaStockBasic GetChinaStockBasic(string Name)
        {
            return _acc.GetChinaStockBasic(Name);
        }

        //public List<ChinaStock> GetChinaStockDetail(string fullName)
@@ -96,5 +102,7 @@
            return (JObject)JsonConvert.DeserializeObject(Result);
        }



    }
}

 GasolineBlend.BLL/MkFinanceLeaseBLL.cs

@@ -19,7 +19,7 @@
        private GetPagingZdDAL getPagingZdDAL = new GetPagingZdDAL();
        private QiChaChaService _qiChaChaService = new QiChaChaService();

        public async Task<MkFinanceLeaseDataPage> GetMkFinanceLeaseList(string Name = "", int PageSize = 5, int PageIndex = 1, int RentPeople = 0, string financingAmount = "", string sizeAll = "", string boardingTime = "", string expirationTime = "", string[] boardingTime2 = null, string[] expirationTime2 = null, string rentMan = "", string leaser = "", string FilterLtd = "0", string tenantAbode = "", string RegCerNumber = "", int ReportId = 0, bool SubLtdFlag = true, string DesOfLeasedProperty = "")
        public async Task<MkFinanceLeaseDataPage> GetMkFinanceLeaseList(string Name = "", int PageSize = 5, int PageIndex = 1, int RentPeople = 0, string financingAmount = "", string sizeAll = "", string boardingTime = "", string expirationTime = "", string[] boardingTime2 = null, string[] expirationTime2 = null, string rentMan = "", string leaser = "", string FilterLtd = "0", string tenantAbode = "", string RegCerNumber = "", string fullName = "", int ReportId = 0, bool SubLtdFlag = true, string DesOfLeasedProperty = "")
        {
            // 补充曾用名增强搜索的用户体验20210722FX
            string OriginalNames = "";

 GasolineBlend.DAL/ChinaStockDAL.cs

@@ -17,6 +17,12 @@
            return Conn.Query<ChinaStock>(sql).ToList();
        }

        public ChinaStockBasic GetChinaStockBasic(string Name)
        {
            var sql = $"select * from stock_basic where name='{Name}' or fullname='{Name}' order by id desc";
            return Conn.QueryFirstOrDefault<ChinaStockBasic>(sql, commandTimeout: 0);
        }

        //public List<ChinaStock> GetChinaStockDetail(string fullName)
        //{
        //    var sql = $"select * from stock_basic where fullname='{fullName}'";

 GasolineBlend.Entity/ChinaStock.cs

@@ -35,4 +35,29 @@

        public string market { get; set; }
    }

    public class ChinaStockBasic
    {
        public int id { get; set; }
        /// <summary>
        /// 股票代码
        /// </summary> 
        public string ts_code { get; set; }
        /// <summary>
        /// 股票简称
        /// </summary>
        public string name { get; set; }
        /// <summary>
        /// 公司代码
        /// </summary>
        public string symbol { get; set; }
        /// <summary>
        /// 地区
        /// </summary> 
        public string area { get; set; }
        /// <summary>
        /// 行业
        /// </summary>
        public string industry { get; set; }
    }
}

 GasolineBlend/Controllers/BankYjController.cs

@@ -3,12 +3,6 @@
using System.Linq;
using System.Threading.Tasks;
using System.Web.Mvc;
using CommonHelper;
using GasolineBlend.BLL;
using GasolineBlend.Entity;
using RiskControl.NewService.Entity.RiskControlStockDL;
using RiskControl.NewService.Extension;
using RiskControl.NewService.QiChaCha.QccEntity2;
using RiskControl.NewService.Service;
using SqlSugar;

@@ -358,9 +352,9 @@
        /// <param name="pageIndex"></param>
        /// <param name="pageSize"></param>
        /// <returns></returns>
        public async Task<ActionResult> GetBankFjcfTableDetail(int pageIndex, int pageSize, string wh = "", string xm = "", string dwmc = "", string ay = "", string cfjd = "", string jgmc = "", DateTime? cfjdrq1 = null, DateTime? cfjdrq2 = null)
        public async Task<ActionResult> GetBankFjcfTableDetail(int pageIndex, int pageSize, string wh = "", string xm = "", string dwmc = "", string ay = "", string cfjd = "", string jgmc = "", DateTime? cfjdrq1 = null, DateTime? cfjdrq2 = null,string fullName="")
        {
            var res = await _bankYjService.GetBankFjcfTableDetail(pageIndex, pageSize, wh, xm, dwmc, ay, cfjd, jgmc, cfjdrq1, cfjdrq2);
            var res = await _bankYjService.GetBankFjcfTableDetail(pageIndex, pageSize, wh, xm, dwmc, ay, cfjd, jgmc, cfjdrq1, cfjdrq2, fullName);
            if (res != null)
            {
                for (int i = 0; i < res.Items.Count; i++)

 GasolineBlend/Controllers/IndustryChainController.cs

@@ -131,6 +131,23 @@

            return SuccessNoShow(data: resTotal);
        }

        /// <summary>
        /// 获取上市公司微点评数量
        /// </summary>
        /// <param name="contentKeyword"></param>
        /// <returns></returns>
        public async Task<ActionResult> GetPageCountLtd(string contentKeyword)
        {
            List<SmartInvestCount> resTotal = new List<SmartInvestCount>();

            //上市公司微点评
            var resSemiMarketCount = await GetPageCountDetail("上市公司微点评", "上市公司微点评", "半导体", contentKeyword);
            resTotal.Add(resSemiMarketCount);

            return SuccessNoShow(data: resTotal);
        }

        /// <summary>
        /// 获取
        /// </summary>

 GasolineBlend/Controllers/MkFinanceLeaseController.cs

@@ -22,12 +22,12 @@
        /// <param name="PId"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<ActionResult> GetMkFinanceLeaseList(string Name = "", int PageSize = 5, int PageIndex = 1, int RentPeople = 0, string financingAmount = "", string sizeAll = "", string boardingTime = "", string expirationTime = "", string[] boardingTime2 =null , string[] expirationTime2 = null, string rentMan="", string leaser = "",string FilterLtd="0",string tenantAbode = "", string RegCerNumber="")
        public async Task<ActionResult> GetMkFinanceLeaseList(string Name = "", int PageSize = 5, int PageIndex = 1, int RentPeople = 0, string financingAmount = "", string sizeAll = "", string boardingTime = "", string expirationTime = "", string[] boardingTime2 =null , string[] expirationTime2 = null, string rentMan="", string leaser = "",string FilterLtd="0",string tenantAbode = "", string RegCerNumber="",string fullName="")
        {
            try
            {
                //LogHelper.Warn("获取相关租赁信息当前开始时间：" + DateTime.Now+"访问用户" + OperatorProvider.Instance.Current.LoginName);
                var list = await _acc.GetMkFinanceLeaseList(FileUtil.ToSBC(Name),PageSize,PageIndex,RentPeople,financingAmount,sizeAll,boardingTime,expirationTime, boardingTime2, expirationTime2, FileUtil.ToSBC(rentMan), FileUtil.ToSBC(leaser), FilterLtd, tenantAbode, RegCerNumber);
                var list = await _acc.GetMkFinanceLeaseList(FileUtil.ToSBC(Name),PageSize,PageIndex,RentPeople,financingAmount,sizeAll,boardingTime,expirationTime, boardingTime2, expirationTime2, FileUtil.ToSBC(rentMan), FileUtil.ToSBC(leaser), FilterLtd, tenantAbode, RegCerNumber, FileUtil.ToSBC(fullName));
                //LogHelper.Warn("获取相关租赁信息当前结束时间:" + DateTime.Now + "访问用户" + OperatorProvider.Instance.Current.LoginName);
                return SuccessNoShow(data: list);
            }

 GasolineBlend/Controllers/RatingReportController.cs

@@ -283,6 +283,19 @@
                        allName.AddRange(usedName.Select(a => a.Name).ToList());
                }
                allName = allName.Distinct().ToList();
                if (param.fullName != "")//补充全称
                {
                    allName.Add(param.fullName);
                    basicInfo = await _qiChaChaService.GetBasicDetail(param.fullName);
                    if (basicInfo.Data != null)
                    {
                        var data = (QccBasicDetail)basicInfo.Data;
                        allName.Add(data.Name);
                        var usedName = data.OriginalName;
                        if (usedName != null && usedName.Any())
                            allName.AddRange(usedName.Select(a => a.Name).ToList());
                    }
                }

                if (param.ReportSource == EnumReportSource.CreditRatingReportSelf)
                {

 GasolineBlend/Controllers/TushareController.cs

@@ -702,7 +702,7 @@
        {
            //根据公司简称或者名称获取ts_code
            string ts_code = "";
            if (companyName.Length <= 4) //判断是否是上市公司并匹配20230318
            if (companyName.Length <= 5) //判断是否是上市公司并匹配20230318
            {
                ChinaStockBLL chinaStockBll = new ChinaStockBLL();
                var list = chinaStockBll.GetChinaStockList(companyName, 1);
@@ -774,6 +774,7 @@
                {"r_and_d", "研发支出"},
                {"goodwill", "商誉"},
                {"lt_amor_exp", "长期待摊费用"},

                {"defer_tax_assets", "递延所得税资产"},
                {"decr_in_disbur", "发放贷款和垫款*"},
                {"oth_nca", "其他非流动资产"},

 RiskControl.NewService/Extension/Params/ReportSearchParam.cs

@@ -69,5 +69,9 @@
        /// 正序/倒序(0 asc;1 desc)
        /// </summary>
        public OrderByEnmu OrderType { get; set; } = OrderByEnmu.Desc;
        /// <summary>
        /// 全称
        /// </summary>
        public string fullName { get; set; } = "";
    }
}

 RiskControl.NewService/QiChaCha/TianYanChaApi.cs

@@ -2,7 +2,6 @@
using System.Configuration;
using CommonHelper;
using RiskControl.NewService.Entity.TycDbEntity;
using RiskControl.NewService.QiChaCha.QccEntity;
using RiskControl.NewService.QiChaCha.TycEntity;

namespace RiskControl.NewService.QiChaCha

 RiskControl.NewService/Service/BankYjService.cs

@@ -579,9 +579,9 @@
        /// <param name="pageIndex"></param>
        /// <param name="pageSize"></param>
        /// <returns></returns>
        public async Task<Page<BankFjcfTableDetail>> GetBankFjcfTableDetail(int pageIndex, int pageSize,string wh,string xm,string dwmc, string ay,string cfjd, string jgmc, DateTime? cfjdrq1, DateTime? cfjdrq2)
        public async Task<Page<BankFjcfTableDetail>> GetBankFjcfTableDetail(int pageIndex, int pageSize,string wh,string xm,string dwmc, string ay,string cfjd, string jgmc, DateTime? cfjdrq1, DateTime? cfjdrq2,string fullName)
        {
            var res = await RiskControlStockDL.Queryable<BankFjcfTableDetail>()
            var res =fullName==""? await RiskControlStockDL.Queryable<BankFjcfTableDetail>()
                .Where(a=>!string.IsNullOrWhiteSpace(a.wh))
                .WhereIF(!string.IsNullOrWhiteSpace(wh),a=>a.wh.Contains(wh))
                .WhereIF(!string.IsNullOrWhiteSpace(xm),a=>a.xm.Contains(xm))
@@ -592,7 +592,19 @@
                .WhereIF(cfjdrq1!=null,a=>a.cfjdrq>=cfjdrq1)
                .WhereIF(cfjdrq2!=null,a=>a.cfjdrq<=cfjdrq1)
                .OrderBy(a => a.cfjdrq, OrderByType.Desc)
                .ToPageAsync(pageIndex, pageSize);
                .ToPageAsync(pageIndex, pageSize):
                await RiskControlStockDL.Queryable<BankFjcfTableDetail>()
                    .Where(a => !string.IsNullOrWhiteSpace(a.wh))
                    .WhereIF(!string.IsNullOrWhiteSpace(wh), a => a.wh.Contains(wh))
                    .WhereIF(!string.IsNullOrWhiteSpace(xm), a => a.xm.Contains(xm))
                    .WhereIF(!string.IsNullOrWhiteSpace(dwmc)&& !string.IsNullOrWhiteSpace(fullName), a => a.dwmc.Contains(dwmc) || a.dwmc.Contains(fullName))
                    .WhereIF(!string.IsNullOrWhiteSpace(ay), a => a.ay.Contains(ay))
                    .WhereIF(!string.IsNullOrWhiteSpace(cfjd), a => a.cfjd.Contains(cfjd))
                    .WhereIF(!string.IsNullOrWhiteSpace(jgmc), a => a.jgmc.Contains(jgmc))
                    .WhereIF(cfjdrq1 != null, a => a.cfjdrq >= cfjdrq1)
                    .WhereIF(cfjdrq2 != null, a => a.cfjdrq <= cfjdrq1)
                    .OrderBy(a => a.cfjdrq, OrderByType.Desc)
                    .ToPageAsync(pageIndex, pageSize);
            return res;
        }


 RiskControl.NewService/Service/LeaseAlarmService.cs

@@ -18,7 +18,6 @@
using GasolineBlend.Entity;
using RiskControl.NewService.Entity.Alarm;
using GasolineBlend.DAL;
using RiskControl.NewService.ViewModel;
using SqlSugar;

namespace RiskControl.NewService.Service
@@ -57,22 +56,21 @@

                //基本信息
                DateTime dt0 = DateTime.Now;
                GetFullDetail(Name, false,AllFlag);
                GetSuspectedActualControl(Name);     //实际控制人
                GetFullDetail(Name, false,AllFlag);    //TD基本信息
                //GetSuspectedActualControl(Name);     //QCC实际控制人

                GetEndCase(Name, ReportId);              //终本案件New20211026

                GetTycTaxCredit(Name, ReportId);   //税务评级
                GetAdminPenaltyCheckList(Name, ReportId);  //行政处罚
                //GetFullDetail                  //经营异常
                GetSeriousViolation(Name, ReportId);       //黑名单
                GetTaxOweNoticeCheckList(Name, ReportId);  //欠税公告
                GetQxbAbnormalEnterpriseByName(Name, ReportId);//非正常户
                GetBankruptcyCheckList(Name, ReportId);//破产重整
                GetTaxIllegalCheckList(Name, ReportId);//税收违法
                GetSimpleCancelCheckInfo(Name, ReportId);//简易注销公告
                GetOffFilingCheckList(Name, ReportId);//注销备案
                GetEnvPunishmentCheckList(Name, ReportId);  //环保处罚
                GetEndCase(Name, ReportId);            //TYC终本案件New20211026
                GetTycTaxCredit(Name, ReportId);       //TYC税务评级
                GetQxbAbnormalEnterpriseByName(Name, ReportId);//QXB非正常户
                GetAdminPenaltyCheckList(Name, ReportId);      //TD行政处罚
                GetTaxOweNoticeCheckList(Name, ReportId);      //TD欠税公告
                GetBankruptcyCheckList(Name, ReportId);        //TD破产重整
                GetTaxIllegalCheckList(Name, ReportId);        //TD税收违法
                GetSimpleCancelCheckInfo(Name, ReportId);      //TD简易注销
                //GetFullDetail                                //QCC经营异常
                //GetSeriousViolation(Name, ReportId);         //QCC黑名单
                //GetOffFilingCheckList(Name, ReportId);       //QCC注销备案
                //GetEnvPunishmentCheckList(Name, ReportId);   //QCC环保处罚

                GetFinaAudit(Name, ReportId); //财务审计意见
                GetForecast(Name, ReportId);  //业绩预告
@@ -88,7 +86,7 @@
                GetZhiXingRen(Name, ReportId);           //被执行人New20211026
                GetEquityFreezeCheck(Name, ReportId);    //股权冻结New20211026
                GetShiXin(Name, ReportId);               //失信被执行
                GetConsumptionRestriction(Name, ReportId);//限制高消费
                GetConsumptionRestriction(Name, ReportId);//TYC限制高消费
                //GetEndCase(Name, ReportId);              //终本案件New20211026
                GetJudicialSaleList(Name, ReportId);     //司法拍卖New20211026
                GetJudicialListCheck(Name, ReportId);    //司法协助New20211026
@@ -96,7 +94,7 @@
                if (AllFlag)
                {
                    GetAnnualReport(Name, ReportId); //企业年报
                    //GetInvestmentCheckList(Name, ReportId); //对外投资
                    GetInvestmentCheckList(Name, ReportId); //TD对外投资
                    //GetECIBranchList(Name, ReportId);       //分支机构
                    //GetHoldingCompany(Name, ReportId);      //控制企业
                    //GetECIParentInfo(Name, ReportId);       //总公司  
@@ -4261,21 +4259,32 @@
        /// <returns></returns>
        public object GetIPODetail(string Name,int ReportId, bool Flag = false)
        {
            var list = qiChaCha.GetIPODetail(Name);
            if (Flag == false)
            {
                if (list.Result.Data != null)
                //从指定库里面获取20230731FX
                ChinaStockDAL chinaStockDal = new ChinaStockDAL();
                var list = chinaStockDal.GetChinaStockBasic(Name);
                if (list != null)
                {
                    var TSCode = list.Result.Data.GetType().GetProperty("TSCode").GetValue(list.Result.Data);
                    return TSCode;
                    return list.ts_code;
                }
                else
                {
                    return null;
                }
                //if (list.Result.Data != null)
                //{
                //    var TSCode = list.Result.Data.GetType().GetProperty("TSCode").GetValue(list.Result.Data);
                //    return TSCode;
                //}
                //else
                //{
                //    return null;
                //}
            }
            else
            {
                var list = qiChaCha.GetIPODetail(Name);
                if (list.Result.Data != null)
                {
                    List<ComDynamicContent> comDynamicContentlist = new List<ComDynamicContent>();

 RiskControl.NewService/Service/LeaseService.cs

@@ -30,25 +30,25 @@
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public async Task<int> Add(FinanceLeaseReportMain model)
        {
            var sub = await GetReport(model.CompanyName.Replace("\\t", "").Trim(), model.ReportDate);
            if (sub == null || sub.Table == null || !sub.Table.Any())
                return 0;
            var res =  RiskControlRRDb.UseTran(() =>
            {
                model.State = "已完成";
                var id = RiskControlRRDb.Insertable(model).ExecuteReturnIdentity();
                sub.ReportId = id;
                RiskControlRRDb.Insertable(sub).ExecuteCommand();
                return id;
            });
        //public async Task<int> Add(FinanceLeaseReportMain model)
        //{
        //    var sub = await GetReport(model.CompanyName.Replace("\\t", "").Trim(), model.ReportDate);
        //    if (sub == null || sub.Table == null || !sub.Table.Any())
        //        return 0;
        //    var res =  RiskControlRRDb.UseTran(() =>
        //    {
        //        model.State = "已完成";
        //        var id = RiskControlRRDb.Insertable(model).ExecuteReturnIdentity();
        //        sub.ReportId = id;
        //        RiskControlRRDb.Insertable(sub).ExecuteCommand();
        //        return id;
        //    });
             

            if (!res.IsSuccess)
                throw res.ErrorException;
            return res.Data;
        }
        //    if (!res.IsSuccess)
        //        throw res.ErrorException;
        //    return res.Data;
        //}

        /// <summary>
        /// 添加报表（异步，用状态）
@@ -76,7 +76,16 @@
                        .SetColumns(a => a.FinishTime == DateTime.Now)
                        .Where(a => a.Id == id).ExecuteCommand();
                    sub.ReportId = id;
                    RiskControlRRDb.Insertable(sub).ExecuteCommand();
                    try
                    {
                        RiskControlRRDb.Insertable(sub).ExecuteCommand();
                    }
                    catch (Exception e)
                    {
                       LogHelper.Error("Lost:"+e.ToString()+"\r\n"+sub.ToString());
                        throw;
                    }
                    
                });
                if (!res.IsSuccess)
                    throw res.ErrorException;
@@ -399,8 +408,7 @@

            #endregion

          int m2 =  tenantCompanyTimeRange.FindIndex(a => a.Name == "深圳市中顺半导体照明有限公司");

          //int m2 =  tenantCompanyTimeRange.FindIndex(a => a.Name == "深圳市中顺半导体照明有限公司");

            #region 计算中断时间，预警信息

@@ -576,6 +584,10 @@
                        item.ToTheDateValue =
                            (item.RegistrationType == "初始登记" ? item.ValueOfLeasedPro : item.ThisBeginValue) -
                            item.ReduceValuePerDay * item.ToTheDateDays;
                        if (item.ToTheDateValue.ToString() == "正无穷大" || item.ToTheDateValue.ToString() == "负无穷大")
                        {
                            LogHelper.Error("ToTheDateValue Error:"+ item.RegistrationType+"-"+ item.ValueOfLeasedPro+"-"+ item.ThisBeginValue+"-"+ item.ReduceValuePerDay+"-"+item.ToTheDateDays+"\\"+ item.ToTheDateValue);
                        }
                        break;
                    }
                    else
@@ -630,7 +642,8 @@
            cl_leaseInfoList.ForEach(a => cl_czr.AddRange(a.TenantCompanyNames));
            reportA.clywbs = cl_leaseInfoList.Count( /*a => a.RegistrationType == "初始登记"*/);
            reportA.clczrsl = cl_czr.Distinct().Count();
            reportA.clzc = leaseInfoList.Sum(a => a.ToTheDateValue);
            reportA.clzc = leaseInfoList.Where(a=>a.ToTheDateValue.ToString()!= "负无穷大"&& a.ToTheDateValue.ToString() != "正无穷大").ToList().Sum(a => a.ToTheDateValue);
            LogHelper.Error(" v:" + leaseInfoList.Where(a => a.ToTheDateValue.ToString() != "负无穷大" && a.ToTheDateValue.ToString() != "正无穷大").ToList().Sum(a => a.ToTheDateValue));
            reportA.czrsl = tenantCompanyTimeRange.Count();

            // 表格数据

 RiskControl.NewService/Service/PjrzService.cs

@@ -22,9 +22,14 @@
        public async Task<Page<PjrzResult>> GetPjrzResult(string typeName, string name, int pageIndex = 1, 
            int PageSize = 10, string orderByCol = "", string orderByType = "desc",string fullName="")
        {
            var queryCompanyNames = RiskControlStockDL.Queryable<PdfCompanys>()
            var queryCompanyNames =fullName==""? RiskControlStockDL.Queryable<PdfCompanys>()
                .Where(a => a.Type == typeName)
                .WhereIF(!string.IsNullOrWhiteSpace(name), a => a.CompanyName == name)
                .GroupBy(a => new { a.CompanyName })
                .Select(a => new { CompanyName = a.CompanyName }): 
                RiskControlStockDL.Queryable<PdfCompanys>()
                .Where(a => a.Type == typeName)
                .WhereIF(!string.IsNullOrWhiteSpace(name) && !string.IsNullOrWhiteSpace(fullName), a => a.CompanyName == name || a.CompanyName == fullName)
                .GroupBy(a => new { a.CompanyName })
                .Select(a => new { CompanyName = a.CompanyName });

@@ -68,11 +73,16 @@
        public async Task<object> GetEntPublicArticlePage(string name, string orderType, int pageIndex,
            int pageSize, string fullName)
        {
            var res = await RiskControlStockDL.Queryable<EntPublicArticleDetail>()
            var res = fullName == "" ? await RiskControlStockDL.Queryable<EntPublicArticleDetail>()
                .WhereIF(!string.IsNullOrWhiteSpace(name), $"author like '%{name}%'")
                .OrderBy(a => a.publishTime, orderType == "desc" ? OrderByType.Desc : OrderByType.Asc)
                .Select(a => new { articleId = a.articleId, author = a.author, title = a.title, publishTime = a.publishTime })
                .ToPageAsync(pageIndex, pageSize);
                .ToPageAsync(pageIndex, pageSize):
                await RiskControlStockDL.Queryable<EntPublicArticleDetail>()
                    .WhereIF(!string.IsNullOrWhiteSpace(name)&& !string.IsNullOrWhiteSpace(fullName), $"author like '%{name}%' or author like '%{fullName}%'")
                    .OrderBy(a => a.publishTime, orderType == "desc" ? OrderByType.Desc : OrderByType.Asc)
                    .Select(a => new { articleId = a.articleId, author = a.author, title = a.title, publishTime = a.publishTime })
                    .ToPageAsync(pageIndex, pageSize);
            return res;
        }

@@ -98,11 +108,16 @@
        public async Task<Page<ShcpeAcceptorCredit>> GetAcceptorCreditPage(int pageIndex, int PageSize,
            string companyName, string fullName)
        {
            var page = await RiskControlStockDL.Queryable<ShcpeAcceptorCredit>()
            var page = fullName == "" ? await RiskControlStockDL.Queryable<ShcpeAcceptorCredit>()
                .Includes(a => a.CompanyInfo)
                .WhereIF(!string.IsNullOrWhiteSpace(companyName), a => a.CompanyInfo.LtdName.Contains(companyName))
                .OrderByDescending(a => a.ActualDate)
                .ToPageAsync(pageIndex, PageSize);
                .ToPageAsync(pageIndex, PageSize):
                await RiskControlStockDL.Queryable<ShcpeAcceptorCredit>()
                    .Includes(a => a.CompanyInfo)
                    .WhereIF(!string.IsNullOrWhiteSpace(companyName)&& !string.IsNullOrWhiteSpace(fullName), a => a.CompanyInfo.LtdName.Contains(companyName) || a.CompanyInfo.LtdName.Contains(fullName))
                    .OrderByDescending(a => a.ActualDate)
                    .ToPageAsync(pageIndex, PageSize);
            return page;
        }


 RiskControl.NewService/Service/SmartInvestAlarmService.cs

@@ -4261,13 +4261,15 @@
        /// <returns></returns>
        public object GetIPODetail(string Name,int ReportId, bool Flag = false)
        {
            var list = qiChaCha.GetIPODetail(Name);
            
            if (Flag == false)
            {
                if (list.Result.Data != null)
                //从指定库里面获取20230731FX
                ChinaStockDAL chinaStockDal = new ChinaStockDAL();
                var list = chinaStockDal.GetChinaStockBasic(Name);
                if (list != null)
                {
                    var TSCode = list.Result.Data.GetType().GetProperty("TSCode").GetValue(list.Result.Data);
                    return TSCode;
                    return list.ts_code;
                }
                else
                {
@@ -4276,6 +4278,7 @@
            }
            else
            {
                var list = qiChaCha.GetIPODetail(Name);
                if (list.Result.Data != null)
                {
                    List<ComDynamicContent> comDynamicContentlist = new List<ComDynamicContent>();