Merge branch 'master' of http://47.92.245.94:8000/r/RiskControl_RR_Fast

WX

2023-06-07 d5a4545c243435aa3dcd515dbd9dc6faf51f3e07

Merge branch 'master' of http://47.92.245.94:8000/r/RiskControl_RR_Fast

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

Binary files differ

 CommonHelper/Excel/NPOIHelper.cs

@@ -1029,50 +1029,56 @@
        public static DataTable Import(string strFileName)
        {
            //int m = 0;
            //try
            //{
            DataTable dt = new DataTable();

            HSSFWorkbook hssfworkbook;
            using (FileStream file = new FileStream(strFileName, FileMode.Open, FileAccess.Read))
            try
            {
                hssfworkbook = new HSSFWorkbook(file);
            }
                DataTable dt = new DataTable();

            ISheet sheet = hssfworkbook.GetSheetAt(0);
            System.Collections.IEnumerator rows = sheet.GetRowEnumerator();

            IRow headerRow = sheet.GetRow(0);
            int cellCount = headerRow.LastCellNum;

            for (int j = 0; j < cellCount; j++)
            {
                //m = j;
                ICell cell = headerRow.GetCell(j);
                dt.Columns.Add(cell.ToString());
            }

            for (int i = (sheet.FirstRowNum + 1); i <= sheet.LastRowNum; i++)
            {
                IRow row = sheet.GetRow(i);
                DataRow dataRow = dt.NewRow();

                for (int j = row.FirstCellNum; j < cellCount; j++)
                HSSFWorkbook hssfworkbook;
                using (FileStream file = new FileStream(strFileName, FileMode.Open, FileAccess.Read))
                {
                    if (row.GetCell(j) != null)
                        dataRow[j] = row.GetCell(j).ToString();
                    hssfworkbook = new HSSFWorkbook(file);
                }

                dt.Rows.Add(dataRow);
            }
                ISheet sheet = hssfworkbook.GetSheetAt(0);
                System.Collections.IEnumerator rows = sheet.GetRowEnumerator();

            return dt;
            //}
            //catch (Exception e)
            //{
            //    Console.WriteLine(m.ToString());
            //    throw;
            //}
                IRow headerRow = sheet.GetRow(0);
                int cellCount = headerRow.LastCellNum;

                for (int j = 0; j < cellCount; j++)
                {
                    //m = j;
                    ICell cell = headerRow.GetCell(j);
                    dt.Columns.Add(cell.ToString());
                }

                for (int i = (sheet.FirstRowNum + 1); i <= sheet.LastRowNum; i++)
                {
                    //if (i == 3)
                    //{
                    //    string mm = "";
                    //}
                    IRow row = sheet.GetRow(i);
                    if (row != null)
                    {
                        DataRow dataRow = dt.NewRow();
                        for (int j = row.FirstCellNum; j < cellCount; j++)
                        {
                            if (row.GetCell(j) != null)
                                dataRow[j] = row.GetCell(j).ToString();
                        }

                        dt.Rows.Add(dataRow);
                    }
                }

                return dt;
            }
            catch (Exception e)
            {
                //Console.WriteLine(m.ToString());
                return null;
            }

        }


 GasolineBlend.BLL/EvaRegoinMapBLL.cs

@@ -18,9 +18,9 @@
        /// <param name="City"></param>
        /// <param name="County"></param>
        /// <returns></returns>
        public EvaRegoinMap GetEvaRegoinMap(string Province, string City, string County = "")
        public EvaRegoinMap GetEvaRegoinMap( string County = "")
        {
            return _acc.GetEvaRegoinMap(Province, City, County);
            return _acc.GetEvaRegoinMap( County);
        }
    }
}

 GasolineBlend.BLL/EvaSubjectExBLL.cs

@@ -6,6 +6,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Newtonsoft.Json.Linq;

namespace GasolineBlend.BLL
{
@@ -155,9 +156,9 @@
        {
            EvaRecallPayParaExBLL evaRecallPayParaExBLL = new EvaRecallPayParaExBLL();
            FinBalanceSheetExBLL finBalanceSheetExBLL = new FinBalanceSheetExBLL();
            QiChaChaService qiChaCha = new QiChaChaService();
            //QiChaChaService qiChaCha = new QiChaChaService();
            TianYanChaService tianyancha=new TianYanChaService();
            SubjectExBLL subjectExBLL = new SubjectExBLL();
            //EvaNatureCorBLL evaNatureCorBLL = new EvaNatureCorBLL();
            EvaRegoinMapBLL evaRegoinMapBLL = new EvaRegoinMapBLL();
            IndustryBLL industryBLL = new IndustryBLL();
            var Flag = 1;
@@ -167,7 +168,6 @@
            //    //
            //}
            var SubIds = "";
            //var EvaReports = "";
            //添加
            foreach (var item in SubId)
            {
@@ -201,7 +201,6 @@
                        var SubjectInfo = _acc.GetEvaSubjectListBySid(Subject[0].id, Subject[0].ProjId);
                        if (SubjectInfo != null)
                        {
                            //evaSubjectEx.PropertyId = SubjectInfo.PropertyId;
                            evaSubjectEx.Country = SubjectInfo.Country;
                            evaSubjectEx.Province = SubjectInfo.Province;
                            evaSubjectEx.City = SubjectInfo.City;
@@ -215,50 +214,28 @@
                        else
                        {
                            var SubName = Subject[0].Title;
                            var Qccinfo = await qiChaCha.GetFullDetail(SubName,false);
                            if (Qccinfo.Data != null)
                            var TycInfo = await tianyancha.GetBaseinfoV3(SubName);
                            if (TycInfo.Data != null)
                            {
                                object Area = Qccinfo.Data.GetType().GetProperty("Area").GetValue(Qccinfo.Data);
                                //object EconKind = Qccinfo.Data.GetType().GetProperty("EconKind").GetValue(Qccinfo.Data);
                                object Industry = Qccinfo.Data.GetType().GetProperty("Industry").GetValue(Qccinfo.Data);
                                if (Area != null)
                                object District = TycInfo.Data.GetType().GetProperty("District").GetValue(TycInfo.Data);
                                object Industry = TycInfo.Data.GetType().GetProperty("IndustryAll").GetValue(TycInfo.Data);
                                if (District != null)
                                {
                                    var Province = Area.GetType().GetProperty("Province").GetValue(Area);
                                    var City = Area.GetType().GetProperty("City").GetValue(Area);
                                    var County = Area.GetType().GetProperty("County").GetValue(Area);
                                    if (County != null)
                                    var evaRegion = evaRegoinMapBLL.GetEvaRegoinMap(District.ToString());
                                    if (evaRegion != null)
                                    {
                                        var evaRegion = evaRegoinMapBLL.GetEvaRegoinMap(Province != null ? Province.ToString() : "", City != null ? City.ToString() : "", County.ToString());
                                        if (evaRegion!=null)
                                        {
                                            evaSubjectEx.Country = evaRegion.CountryValue;
                                            evaSubjectEx.Province = evaRegion.ProvinceValue;
                                            evaSubjectEx.City = evaRegion.CityValue;
                                            evaSubjectEx.RegionInfo = "中国/" + evaRegion.SysProvince + "/" + evaRegion.SysCity;
                                        }
                                        else
                                        {
                                            LogHelper.Warn("当前主体没有获取到信息 SubName:" + SubName);
                                        }
                                        
                                        evaSubjectEx.Country = evaRegion.CountryValue;
                                        evaSubjectEx.Province = evaRegion.ProvinceValue;
                                        evaSubjectEx.City = evaRegion.CityValue;
                                        evaSubjectEx.RegionInfo = "中国/" + evaRegion.SysProvince + "/" + evaRegion.SysCity;
                                    }
                                    else
                                    {
                                        var evaRegion = evaRegoinMapBLL.GetEvaRegoinMap(Province!=null?Province.ToString():"", City!=null? City.ToString():"");
                                        if (evaRegion!=null)
                                        {
                                            evaSubjectEx.Country = evaRegion.CountryValue;
                                            evaSubjectEx.Province = evaRegion.ProvinceValue;
                                            evaSubjectEx.City = evaRegion.CityValue;
                                            evaSubjectEx.RegionInfo = "中国/" + evaRegion.SysProvince + "/" + evaRegion.SysCity;
                                        }
                                        else
                                        {
                                            LogHelper.Warn("当前主体没有获取到信息 SubName:" + SubName);
                                        }

                                        evaSubjectEx.Country = 1000;
                                        evaSubjectEx.Province = 0;
                                        evaSubjectEx.City = 0;
                                        evaSubjectEx.RegionInfo = "不限国家";
                                    }

                                }
                                else
                                {
@@ -268,12 +245,15 @@
                                    evaSubjectEx.RegionInfo = "不限国家";

                                }

                                if (Industry != null)
                                {
                                    var SmallCategoryCode = Industry.GetType().GetProperty("SmallCategoryCode").GetValue(Industry);
                                    if (SmallCategoryCode != null)
                                    JObject IndustryArray = JObject.Parse(Industry.ToString());
                                    var SmallCategory = IndustryArray["categorySmall"].ToString();
                                    var MidCategory = IndustryArray["categoryMiddle"].ToString();
                                    if (SmallCategory != null && SmallCategory!="")
                                    {
                                        var industry = industryBLL.GetIndustrybyClassThirds(int.Parse(SmallCategoryCode.ToString()));
                                        var industry = industryBLL.GetIndustrybyNameThird(SmallCategory);
                                        if (industry != null)
                                        {
                                            evaSubjectEx.ClassLabel = industry.ClassLabel;
@@ -290,7 +270,26 @@
                                            evaSubjectEx.ClassThird = 10000;
                                            evaSubjectEx.ClassIndustry = "不限行业";
                                        }

                                    }
                                    else if (MidCategory != null && MidCategory != "")
                                    {
                                        var industry = industryBLL.GetIndustrybyNameSecond(MidCategory);
                                        if (industry != null)
                                        {
                                            evaSubjectEx.ClassLabel = industry.ClassLabel;
                                            evaSubjectEx.ClassFirst = industry.ClassFirst;
                                            evaSubjectEx.ClassSecond = industry.ClassSecond;
                                            evaSubjectEx.ClassThird = industry.ClassThird;
                                            evaSubjectEx.ClassIndustry = industry.NameLabel + "/" + industry.NameFirst + "/" + industry.NameSecond + "/" + industry.NameThird;
                                        }
                                        else
                                        {
                                            evaSubjectEx.ClassLabel = "X";
                                            evaSubjectEx.ClassFirst = 100;
                                            evaSubjectEx.ClassSecond = 1000;
                                            evaSubjectEx.ClassThird = 10000;
                                            evaSubjectEx.ClassIndustry = "不限行业";
                                        }
                                    }
                                    else
                                    {
@@ -321,10 +320,115 @@
                                evaSubjectEx.ClassSecond = 1000;
                                evaSubjectEx.ClassThird = 10000;
                                evaSubjectEx.ClassIndustry = "不限行业";
                                //evaSubjectEx.PropertyId = 14;
                            }
                           
                            //var Qccinfo = await qiChaCha.GetFullDetail(SubName,false);
                            //if (Qccinfo.Data != null)
                            //{
                            //    object Area = Qccinfo.Data.GetType().GetProperty("Area").GetValue(Qccinfo.Data);
                            //    //object EconKind = Qccinfo.Data.GetType().GetProperty("EconKind").GetValue(Qccinfo.Data);
                            //    object Industry = Qccinfo.Data.GetType().GetProperty("Industry").GetValue(Qccinfo.Data);
                            //    if (Area != null)
                            //    {
                            //        var Province = Area.GetType().GetProperty("Province").GetValue(Area);
                            //        var City = Area.GetType().GetProperty("City").GetValue(Area);
                            //        var County = Area.GetType().GetProperty("County").GetValue(Area);
                            //        if (County != null)
                            //        {
                            //            var evaRegion = evaRegoinMapBLL.GetEvaRegoinMap(Province != null ? Province.ToString() : "", City != null ? City.ToString() : "", County.ToString());
                            //            if (evaRegion!=null)
                            //            {
                            //                evaSubjectEx.Country = evaRegion.CountryValue;
                            //                evaSubjectEx.Province = evaRegion.ProvinceValue;
                            //                evaSubjectEx.City = evaRegion.CityValue;
                            //                evaSubjectEx.RegionInfo = "中国/" + evaRegion.SysProvince + "/" + evaRegion.SysCity;
                            //            }
                            //            else
                            //            {
                            //                LogHelper.Warn("当前主体没有获取到信息 SubName:" + SubName);
                            //            }

                            //        }
                            //        else
                            //        {
                            //            var evaRegion = evaRegoinMapBLL.GetEvaRegoinMap(Province!=null?Province.ToString():"", City!=null? City.ToString():"");
                            //            if (evaRegion!=null)
                            //            {
                            //                evaSubjectEx.Country = evaRegion.CountryValue;
                            //                evaSubjectEx.Province = evaRegion.ProvinceValue;
                            //                evaSubjectEx.City = evaRegion.CityValue;
                            //                evaSubjectEx.RegionInfo = "中国/" + evaRegion.SysProvince + "/" + evaRegion.SysCity;
                            //            }
                            //            else
                            //            {
                            //                LogHelper.Warn("当前主体没有获取到信息 SubName:" + SubName);
                            //            }

                            //        }

                            //    }
                            //    else
                            //    {
                            //        evaSubjectEx.Country = 1000;
                            //        evaSubjectEx.Province = 0;
                            //        evaSubjectEx.City = 0;
                            //        evaSubjectEx.RegionInfo = "不限国家";

                            //    }
                            //    if (Industry != null)
                            //    {
                            //        var SmallCategoryCode = Industry.GetType().GetProperty("SmallCategoryCode").GetValue(Industry);
                            //        if (SmallCategoryCode != null)
                            //        {
                            //            var industry = industryBLL.GetIndustrybyClassThirds(int.Parse(SmallCategoryCode.ToString()));
                            //            if (industry != null)
                            //            {
                            //                evaSubjectEx.ClassLabel = industry.ClassLabel;
                            //                evaSubjectEx.ClassFirst = industry.ClassFirst;
                            //                evaSubjectEx.ClassSecond = industry.ClassSecond;
                            //                evaSubjectEx.ClassThird = industry.ClassThird;
                            //                evaSubjectEx.ClassIndustry = industry.NameLabel + "/" + industry.NameFirst + "/" + industry.NameSecond + "/" + industry.NameThird;
                            //            }
                            //            else
                            //            {
                            //                evaSubjectEx.ClassLabel = "X";
                            //                evaSubjectEx.ClassFirst = 100;
                            //                evaSubjectEx.ClassSecond = 1000;
                            //                evaSubjectEx.ClassThird = 10000;
                            //                evaSubjectEx.ClassIndustry = "不限行业";
                            //            }

                            //        }
                            //        else
                            //        {
                            //            evaSubjectEx.ClassLabel = "X";
                            //            evaSubjectEx.ClassFirst = 100;
                            //            evaSubjectEx.ClassSecond = 1000;
                            //            evaSubjectEx.ClassThird = 10000;
                            //            evaSubjectEx.ClassIndustry = "不限行业";
                            //        }
                            //    }
                            //    else
                            //    {
                            //        evaSubjectEx.ClassLabel = "X";
                            //        evaSubjectEx.ClassFirst = 100;
                            //        evaSubjectEx.ClassSecond = 1000;
                            //        evaSubjectEx.ClassThird = 10000;
                            //        evaSubjectEx.ClassIndustry = "不限行业";
                            //    }
                            //}
                            //else
                            //{
                            //    evaSubjectEx.Country = 1000;
                            //    evaSubjectEx.Province = 0;
                            //    evaSubjectEx.City = 0;
                            //    evaSubjectEx.RegionInfo = "不限国家";
                            //    evaSubjectEx.ClassLabel = "X";
                            //    evaSubjectEx.ClassFirst = 100;
                            //    evaSubjectEx.ClassSecond = 1000;
                            //    evaSubjectEx.ClassThird = 10000;
                            //    evaSubjectEx.ClassIndustry = "不限行业";
                            //    //evaSubjectEx.PropertyId = 14;
                            //}
                        }
                    }
                    PropertyInfoExBLL propertyInfoExBll=new PropertyInfoExBLL();

 GasolineBlend.BLL/FRMReportInfoBLL.cs

@@ -10,7 +10,7 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using CommonHelper;
using System.Text.RegularExpressions;


namespace GasolineBlend.BLL
{
@@ -27,9 +27,30 @@
        /// </summary>
        /// <param name="UserId"></param>
        /// <returns></returns>
        public List<FRMReportInfo> GetFRMReportlist(string UserId)
        public FRMReportInfoDataPage GetFRMReportlist(int PageIndex, int PageSize,string UserId)
        {
            return _acc.GetFRMReportlist(UserId).OrderByDescending(p=>p.CreateTime).ToList();
            FRMReportInfoDataPage dataPage = new FRMReportInfoDataPage();

            GetPagingFRDAL getPagingFRDAL = new GetPagingFRDAL();
            int TotalCount = 0;
            string strWhere = " IsDelete=0";
            if (UserId!="")
            {
                strWhere += $" and UserId='{UserId}'";
            }
            var list = getPagingFRDAL.GetUserAccess<FRMReportInfo>("*", "FRMReportInfo", PageIndex, PageSize, strWhere,
                "CreateTime", ref TotalCount);
            //获取总条数
            var totalcount = TotalCount;
            //获取总页数
            var totalpages = Math.Ceiling(totalcount * 1.0 / PageSize);
            //总条数 æ€»é¡µæ•° 
            dataPage.TotalItems = totalcount;
            dataPage.TotalPages = Convert.ToInt32(totalpages);
            dataPage.CurrentPage = PageIndex;
            dataPage.PageSize = PageSize;
            dataPage.ListFrmReportInfos = list;
            return dataPage;
        }
        /// <summary>
        /// åˆ é™¤æŠ¥è¡¨
@@ -49,6 +70,7 @@
        {
            return _acc.AddFRMReport(fRMReportInfo);
        }

        public string OpenId(string code)
        {
            string js_code = code;

 GasolineBlend.BLL/FinBalanceSheetExBLL.cs

@@ -12,9 +12,30 @@
    public class FinBalanceSheetExBLL
    {
        private FinBalanceSheetExDAL _acc = new FinBalanceSheetExDAL();
        public List<FinBalanceSheetEx> GetBalanceSheetList(int SubjectId, int ProjId)
        public FinBalanceSheetExDataPage GetBalanceSheetList(int SubjectId, int ProjId,int PageIndex,int PageSize)
        {
            return _acc.GetBalanceSheetList(SubjectId, ProjId);
            FinBalanceSheetExDataPage dataPage = new FinBalanceSheetExDataPage();

            GetPagingDBDAL getPagingDBDAL = new GetPagingDBDAL();
            int TotalCount = 0;
            string strWhere = $" a.ProjId = {ProjId} ";
            if (SubjectId > 0)
            {
                strWhere += $" and SubjectId={SubjectId}";
            }
            var list = getPagingDBDAL.GetUserAccess<FinBalanceSheetEx>("a.*,b.Title", "finBalanceSheetEx a left join mainSubjectEx  b on a.SubjectId=b.id", PageIndex, PageSize, strWhere,
                "CreateTime", ref TotalCount);
            //获取总条数
            var totalcount = TotalCount;
            //获取总页数
            var totalpages = Math.Ceiling(totalcount * 1.0 / PageSize);
            //总条数 æ€»é¡µæ•° 
            dataPage.TotalItems = totalcount;
            dataPage.TotalPages = Convert.ToInt32(totalpages);
            dataPage.CurrentPage = PageIndex;
            dataPage.PageSize = PageSize;
            dataPage.ListFinBalanceSheetExs = list;
            return dataPage;
        }
        public List<FinBalanceSheetEx> GetBalanceSheetSel(int ProjId)
        {

 GasolineBlend.BLL/IndustryBLL.cs

@@ -41,6 +41,16 @@
            return _acc.GetIndustrybyClassThird(ClassThird);
        }

        public Industry GetIndustrybyNameSecond(string NameSecond)
        {
            return _acc.GetIndustrybyNameSecond(NameSecond);
        }

        public Industry GetIndustrybyNameThird(string NameThird)
        {
            return _acc.GetIndustrybyNameThird(NameThird);
        }


        public void LoadIndustryList(string RangeFlag, List<Industry> industryLables)
        {

 GasolineBlend.BLL/MkPledgeRevBLL.cs

@@ -24,7 +24,7 @@
        /// <param name="PageSize"></param>
        /// <param name="PageIndex"></param>
        /// <returns></returns>
        public async Task<MkProductionEquipmentDataPage> GetPledgeRevList(int PageSize = 5, int PageIndex = 1, string Name = "", int SelState = 0, int TypeId = 0, string NameOfMortgagor = "", string NameOfMortgagee = "", string PriContractAmount = "", string sizeAll = "", string[] RegistrationTime = null, string[] DateOfRegistration = null, string RegCerNumber = "", bool SubLtdFlag = true)
        public async Task<MkProductionEquipmentDataPage> GetPledgeRevList(int PageSize = 5, int PageIndex = 1, string Name = "", int SelState = 0, int TypeId = 0, string NameOfMortgagor = "", string NameOfMortgagee = "", string PriContractAmount = "", string RegistrationType = "", string[] RegistrationTime = null, string[] DateOfRegistration = null, string RegCerNumber = "", bool SubLtdFlag = true)
        {
            // è¡¥å……曾用名增强搜索的用户体验20210722FX
            string OriginalNames = "";
@@ -183,10 +183,10 @@
                //}
                Flag = true;
            }
            if (sizeAll != "" && sizeAll != "全部")
            if (RegistrationType != "" && RegistrationType != "全部")
            {
                //根据多选模糊匹配20230317FX
                string []sArray = Regex.Split(sizeAll, "or", RegexOptions.IgnoreCase);
                string []sArray = Regex.Split(RegistrationType, "or", RegexOptions.IgnoreCase);
                StrWhere += " and (";
                for (int i = 0; i < sArray.Length; i++)
                {
@@ -225,7 +225,7 @@
                Flag = true;
            }
            #endregion
            //StrWhere += " and RegistrationType not like'注销登记'";

            if (Flag == false && PageIndex <= 4)
            {
                newlist = getPagingZdDAL.GetUserAccess<MkProductionEquipment>("*, OwnershipRightOfUse  as TimeLimitForDebtPer", "PledgeRevTemp", PageIndex, PageSize, StrWhere, "RegistrationTime", ref TotalCount);

 GasolineBlend.BLL/ResultsIdentifyBLL.cs

@@ -96,6 +96,7 @@
        }

        #endregion

        #region è¯‘图
        public static string GetReportJson2(string FileName)
        {
@@ -141,7 +142,7 @@
        public static async Task<DataTable> AliOcrTable(string base64Str)
        {
            var sysUrl = "https://analysis.market.alicloudapi.com/ocrservice/table";
            var sysAppcode = "b77bcd5d997f47ecaee28e359fbcd605";
            var sysAppcode = Configs.GetValue("AliOCRKey"); //"b77bcd5d997f47ecaee28e359fbcd605";
            var body = new {img = base64Str, rotate = false};

            var res = await sysUrl

 GasolineBlend.BLL/SysAccountMenuBLL.cs

@@ -99,7 +99,7 @@
        }

        /// <summary>
        /// æ·»åŠ ä¸€æ¡å¸¸ç”¨å·¥å…·ä¿¡æ¯
        /// æ·»åŠ ä¸€æ¡å¸¸ç”¨åŠŸèƒ½ä¿¡æ¯
        /// </summary>
        /// <param name="sysAccountMenu"></param>
        /// <returns></returns>
@@ -120,7 +120,7 @@
        }

        /// <summary>
        /// åˆ é™¤ä¸€æ¡å¸¸ç”¨å·¥å…·ä¿¡æ¯
        /// åˆ é™¤ä¸€æ¡å¸¸ç”¨åŠŸèƒ½ä¿¡æ¯
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
@@ -128,5 +128,15 @@
        {
            return _acc.DeleteSysAccountMenubyId(id);
        }

        /// <summary>
        /// æ ¹æ®UserId获取统计数据
        /// </summary>
        /// <param name="UserId"></param>
        /// <returns></returns>
        public int GetSysAccountMenuCount(int UserId)
        {
            return _acc.GetSysAccountMenuCount(UserId);
        }
    }
}

 GasolineBlend.BLL/SysAccountNewsBLL.cs

@@ -13,6 +13,16 @@
        private SysAccountNewsDAL _acc = new SysAccountNewsDAL();

        /// <summary>
        /// æ ¹æ®UserId和TypeId获取自定义信息
        /// </summary>
        /// <param name="id">用户id</param>
        /// <returns></returns>
        public SysAccountNews GetSysAccountNewsbyUserId(int UserId, int TypeId)
        {
            return _acc.GetSysAccountNewsbyUserId(UserId, TypeId);
        }

        /// <summary>
        /// æ·»åŠ ä¸€æ¡è‡ªå®šä¹‰é…ç½®
        /// </summary>
        /// <param name="sysAccountNews"></param>
@@ -21,5 +31,28 @@
        {
            return _acc.AddSysAccountNews(sysAccountNews);
        }

        /// <summary>
        /// æ˜¯å¦å­˜åœ¨å·²æ·»åŠ é¡¹ç›®
        /// </summary>
        /// <param name="sysAccountMenu"></param>
        /// <param name="ModifyFlag"></param>
        /// <returns></returns>
        public bool ExistSysAccountNews(SysAccountNews sysAccountNews, bool ModifyFlag)
        {
            return _acc.ExistSysAccountNews(sysAccountNews, ModifyFlag);
        }

        /// <summary>
        /// æ›´æ–°ä¸€æ¡è‡ªå®šä¹‰é…ç½®
        /// </summary>
        /// <param name="Keyword"></param>
        /// <param name="UserId"></param>
        /// <param name="TypeId">1.7*24小时新闻，2.全局新闻</param>
        /// <returns></returns>
        public bool UpdateSysAccountNews(string Keyword, int UserId, int TypeId)
        {
           return _acc.UpdateSysAccountNews(Keyword, UserId, TypeId);
        }
    }
}

 GasolineBlend.BLL/TushareNewsBLL.cs

@@ -14,7 +14,7 @@
        private GetPagingDAL GetPagingDAL = new GetPagingDAL();

       
        public DataPage GetNewsList(int SubClassId, string ParContent,int PageSize,int PageIndex)
        public DataPage GetNewsList(int SubClassId, string ParContent,int PageSize,int PageIndex,int UserId)
        {
            var Channels1 = "";
            int Channels2 = 0;
@@ -101,6 +101,8 @@
            {
                Channels1 = "其他";
            }

            
            #endregion
            int TotalCount = 0;
            var StrWhere=" 1=1 ";
@@ -126,7 +128,24 @@

                 StrWhere += ")";
            }
           

            if (UserId > 0)
            {
                SysAccountNewsBLL _accountNewsBll = new SysAccountNewsBLL();
                var InfoKeyword = _accountNewsBll.GetSysAccountNewsbyUserId(UserId, 1);
                if (InfoKeyword != null && InfoKeyword.Keyword != null && InfoKeyword.Keyword.Length > 0)
                {
                    StrWhere += $" and  (";
                    string[] InfoKeywordArray = InfoKeyword.Keyword.Split(new char[] { ',', '，' });

                    for (int i = 0; i < InfoKeywordArray.Length; i++)
                    {
                        StrWhere += (i==0?"":" or ")+ $"  contains(Contents ,'*{InfoKeywordArray[i]}*') ";
                    }
                    StrWhere += ")";
                }
            }

            if (SubClassId!=0)
            {
                StrWhere += $" and ( SubClassId={SubClassId}  ";
@@ -193,14 +212,14 @@

        }

        public DataPageMajor GetMajorNewsList(string ParContent, int PageSize, int PageIndex)
        public DataPageMajor GetMajorNewsList(string ParContent, int PageSize, int PageIndex,int UserId)
        {
            int TotalCount = 0;
            var StrWhere = " 1=1 ";
            if (ParContent != "")
            {
                ParContent = ParContent.Replace("(", "").Replace(")", "");
                StrWhere += $" and  (Contents like '%{ParContent}%' or Title like '%{ParContent}%' ";
                StrWhere += $" and  (contains(Contents ,'*{ParContent}*') "; //or Title like '%{ParContent}%' 
                if (ParContent.Length <= 4) //判断是否是上市公司并匹配20230318
                {
                    ChinaStockBLL chinaStockBll = new ChinaStockBLL();
@@ -212,11 +231,29 @@
                        if (chinaStockFirst != null)
                        {
                            string FullName = chinaStockFirst.fullname;
                            StrWhere += $" or Contents like '%{FullName}%' or Title like '%{FullName}%' ";
                            StrWhere += $" or contains(Contents ,'*{FullName}*')  "; //or Title like '%{FullName}%'
                        }
                    }
                }
                
                StrWhere += ") ";
            }

            if (UserId > 0)
            {
                SysAccountNewsBLL _accountNewsBll = new SysAccountNewsBLL();
                var InfoKeyword = _accountNewsBll.GetSysAccountNewsbyUserId(UserId, 2);
                if (InfoKeyword != null && InfoKeyword.Keyword != null && InfoKeyword.Keyword.Length > 0)
                {
                    StrWhere += $" and  (";
                    string[] InfoKeywordArray = InfoKeyword.Keyword.Split(new char[] { ',', '，' });
                    for (int i = 0; i < InfoKeywordArray.Length; i++)
                    {
                        StrWhere += (i == 0 ? "" : " or ") + $" contains(Contents ,'*{InfoKeywordArray[i]}*') ";
                    }
                    StrWhere += ")";
                }

            }

            var slist = GetPagingDAL.GetUserAccess<TushareMajorNews>("id,Contents,Title,PubTime", "TushareMajorNews", PageIndex, PageSize, StrWhere, "PubTime", ref TotalCount);
@@ -249,11 +286,18 @@
            #endregion

        }

        public List<NewsSubClass> GetSubClassList()
        {
            return _acc.GetSubClassList();
        }

        //public TushareMajorNews GetMajorNewsbyId(int id)
        //{
        //    return _acc.GetMajorNewsbyId(id);

        //}

        public bool UpdTushareMajorNew(string Contents, int Id)
        {
            return _acc.UpdTushareMajorNew(Contents, Id);

 GasolineBlend.DAL/EvaRegoinMapDAL.cs

@@ -17,12 +17,12 @@
        /// <param name="City"></param>
        /// <param name="County"></param>
        /// <returns></returns>
        public EvaRegoinMap GetEvaRegoinMap(string Province,string City,string County="")
        public EvaRegoinMap GetEvaRegoinMap(string County="")
        {
            StringBuilder sql = new StringBuilder($"select a.*,b.CountryValue,b.ProvinceValue,b.CityValue from sysRegoinMap a left join sysRegionInfo b on a.SysProvince=b.ProvinceName and a.SysCity=b.CityName where (a.Province='{Province}' or a.City='{City}')");
            StringBuilder sql = new StringBuilder($"select a.*,b.CountryValue,b.ProvinceValue,b.CityValue from sysRegoinMap a left join sysRegionInfo b on a.SysProvince=b.ProvinceName and a.SysCity=b.CityName "); //(a.Province='{Province}' or a.City='{City}')
            if (County!="")
            {
                sql.Append($" and a.County='{County}'");
                sql.Append($" where a.County='{County}'");
            }
            return Conn.QueryFirstOrDefault<EvaRegoinMap>(sql.ToString());
        }

 GasolineBlend.DAL/GetPagingDAL.cs

@@ -9,7 +9,7 @@

namespace GasolineBlend.DAL
{
   public class GetPagingDAL:BaseNewsDAL
    public class GetPagingDAL:BaseNewsDAL
    {
        #region åˆ†é¡µèŽ·å–数据
        /// <summary>
@@ -172,4 +172,40 @@
        }
        #endregion
    }

    public class GetPagingFRDAL : BaseFRDAL
    {
        #region åˆ†é¡µèŽ·å–数据
        /// <summary>
        /// åˆ†é¡µ
        /// </summary>
        /// <typeparam name="T"></typeparam>
        /// <param name="selectStr">查询的列数</param>
        /// <param name="tableName">查询的表名</param>
        /// <param name="pageIndex">当前页</param>
        /// <param name="pageSize">页面长度</param>
        /// <param name="strWhere">查询条件</param>
        /// <param name="orderName">排序条件</param>
        /// <param name="RecordCount">返回条数</param>
        /// <returns></returns>
        public List<T> GetUserAccess<T>(string selectStr, string tableName, int pageIndex, int pageSize, string strWhere, string orderName, ref int TotalCount)
        {
            var p = new DynamicParameters();
            p.Add("@TableFields", selectStr);
            p.Add("@TableName", tableName);
            p.Add("@SqlWhere", strWhere);
            p.Add("@OrderBy", orderName);
            p.Add("@PageIndex", pageIndex);
            p.Add("@PageSize", pageSize);
            p.Add("@TotalCount", dbType: DbType.Int32, direction: ParameterDirection.Output);
            List<T> ret = new List<T>();
            ret = Conn.Query<T>("Proc_Paging", p, commandType: CommandType.StoredProcedure, buffered: true, commandTimeout: 0).ToList();
            //ret = GetCJFDData(ret);
            TotalCount = p.Get<int>("TotalCount");

            return ret;
        }

        #endregion
    }
}

 GasolineBlend.DAL/IndustryDAL.cs

@@ -61,5 +61,24 @@
            paras.Add("ClassThird", ClassThird);
            return Conn.QueryFirstOrDefault<Industry>(sql.ToString(), paras);
        }


        public Industry GetIndustrybyNameSecond(string NameSecond)
        {
            var sql = new StringBuilder("select * from sysIndustry2 ");
            DynamicParameters paras = new DynamicParameters();
            sql = sql.Append(" where NameSecond=@NameSecond");
            paras.Add("NameSecond", NameSecond);
            return Conn.QueryFirstOrDefault<Industry>(sql.ToString(), paras);
        }

        public Industry GetIndustrybyNameThird(string NameThird)
        {
            var sql = new StringBuilder("select * from sysIndustry2 ");
            DynamicParameters paras = new DynamicParameters();
            sql = sql.Append(" where NameThird=@NameThird");
            paras.Add("NameThird", NameThird);
            return Conn.QueryFirstOrDefault<Industry>(sql.ToString(), paras);
        }
    }
}

 GasolineBlend.DAL/MkPledgeRevDAL.cs

@@ -230,7 +230,7 @@
        /// <param name="NameOfSeller"></param>
        /// <param name="Id"></param>
        /// <returns></returns>
        public bool UpdPledgeRev(string NameOfMortgagee, string NameOfMortgagor, int Id, int TypeId)
        public bool UpdPledgeRev(string NameOfMortgagor,string NameOfMortgagee,  int Id, int TypeId)
        {
            var sql = $"update PledgeRev set NameOfMortgagee='{NameOfMortgagee}',NameOfMortgagor='{NameOfMortgagor}' where Id={Id} and TypeId={TypeId}";
            return Conn.Execute(sql,commandTimeout:0) > 0;

 GasolineBlend.DAL/RRMonitorGroupDAL.cs

@@ -16,7 +16,7 @@

        public List<RRMonitorGroup> GetRRMonitorGroupListTop2(int UserId)
        {
            var sql = $"select top 3.* from RRMonitorGroup where CreateUserId={UserId} order by CreateTime desc";
            var sql = $"select top 2.* from RRMonitorGroup where CreateUserId={UserId} order by CreateTime desc";
            return Conn.Query<RRMonitorGroup>(sql).ToList();
        }


 GasolineBlend.DAL/SysAccountMenuDAL.cs

@@ -21,13 +21,12 @@
        }

        /// <summary>
        /// æ·»åŠ ä¸€æ¡å¸¸ç”¨å·¥å…·ä¿¡æ¯
        /// æ·»åŠ ä¸€æ¡å¸¸ç”¨åŠŸèƒ½ä¿¡æ¯
        /// </summary>
        /// <param name="sysAccountMenu"></param>
        /// <returns></returns>
        public int AddSysAccountMenu(SysAccountMenu sysAccountMenu)
        {
            //var sql = $"insert into assessFile (FileName,FileType,FileRemark,CapitalId,FilePath,DebtId,GageId,WaterfallInnerId,DebtOutId,ProjPartId,SubjectId,UserId) Values(@FileName,@FileType,@FileRemark,@CapitalId,@FilePath,@DebtId,@GageId,@WaterfallInnerId,@DebtOutId,@ProjPartId,@SubjectId,@UserId);select @@IDENTITY;";
            string sql = "INSERT INTO sysAccountMenu (UserId,ToolName) VALUES (@UserId,@ToolName);select @@IDENTITY;";
            return Conn.ExecuteScalar<int>(sql, sysAccountMenu);
        }
@@ -46,7 +45,7 @@
        }

        /// <summary>
        /// åˆ é™¤ä¸€æ¡å¸¸ç”¨å·¥å…·ä¿¡æ¯
        /// åˆ é™¤ä¸€æ¡å¸¸ç”¨åŠŸèƒ½ä¿¡æ¯
        /// </summary>
        /// <param name="id"></param>
        /// <param name="UserId"></param>
@@ -56,5 +55,16 @@
            var sql = $"delete from sysAccountMenu where id={id}";
            return Conn.Execute(sql) > 0;
        }

        /// <summary>
        /// æ ¹æ®UserId获取统计数据
        /// </summary>
        /// <param name="UserId"></param>
        /// <returns></returns>
        public int GetSysAccountMenuCount(int UserId)
        {
            var sql = $"select COUNT(*) from sysAccountMenu where UserId={UserId}";
            return Conn.ExecuteScalar<int>(sql);
        }
    }
}

 GasolineBlend.DAL/SysAccountNewsDAL.cs

@@ -10,6 +10,29 @@
{
    public class SysAccountNewsDAL:BaseDAL
    {

        /// <summary>
        /// æ ¹æ®UserId和TypeId获取自定义信息
        /// </summary>
        /// <param name="id">用户id</param>
        /// <returns></returns>
        public SysAccountNews GetSysAccountNewsbyUserId(int UserId,int TypeId)
        {
            var sql = new StringBuilder("select * from sysAccountNews");
            DynamicParameters paras = new DynamicParameters();
            if (UserId != 0)
            {
                sql = sql.Append(" where UserId=@UserId and TypeId=@TypeId");
                paras.Add("UserId", UserId);
                paras.Add("TypeId", TypeId);
                return Conn.QueryFirstOrDefault<SysAccountNews>(sql.ToString(), paras);
            }
            else
            {
                return null;
            }
        }

        /// <summary>
        /// æ·»åŠ ä¸€æ¡è‡ªå®šä¹‰é…ç½®
        /// </summary>
@@ -17,8 +40,34 @@
        /// <returns></returns>
        public int AddSysAccountNews(SysAccountNews sysAccountNews)
        {
            string sql = "INSERT INTO sysAccountNews VALUES(@UserId,@Keyword,@TypeId,DEFAULT)";
            string sql = "INSERT INTO sysAccountNews (UserId,Keyword,TypeId) VALUES(@UserId,@Keyword,@TypeId);select @@IDENTITY;";
            return Conn.ExecuteScalar<int>(sql, sysAccountNews);
        }

        /// <summary>
        /// æ˜¯å¦å­˜åœ¨å·²æ·»åŠ é¡¹ç›®
        /// </summary>
        /// <param name="sysAccountMenu"></param>
        /// <param name="ModifyFlag"></param>
        /// <returns></returns>
        public bool ExistSysAccountNews(SysAccountNews sysAccountNews, bool ModifyFlag)
        {
            string strCompareSQL = (ModifyFlag == false ? "" : " and id<>@id");
            var sql = $"select * from sysAccountNews where UserId=@UserId and TypeId=@TypeId" + strCompareSQL;
            return Conn.ExecuteScalar<int>(sql, sysAccountNews) > 0;
        }

        /// <summary>
        /// æ›´æ–°ä¸€æ¡è‡ªå®šä¹‰é…ç½®
        /// </summary>
        /// <param name="Keyword"></param>
        /// <param name="UserId"></param>
        /// <param name="TypeId">1.7*24小时新闻，2.全局新闻</param>
        /// <returns></returns>
        public bool UpdateSysAccountNews(string Keyword, int UserId,int TypeId) 
        {
            var sql = $"update sysAccountNews set Keyword='{Keyword}' where UserId={UserId} and TypeId={TypeId};";
            return Conn.Execute(sql) > 0;
        }
    }
}

 GasolineBlend.DAL/TushareNewsDAL.cs

@@ -78,6 +78,23 @@
            return Conn.Execute(sql, paras) > 0;
        }

        //public TushareMajorNews GetMajorNewsbyId(int id)
        //{
        //    try
        //    {
        //        var sql = new StringBuilder("select * from TushareMajorNews ");
        //        DynamicParameters paras = new DynamicParameters();
        //        sql = sql.Append(" where id=@id");
        //        paras.Add("id", id);
        //        return Conn.QueryFirstOrDefault<TushareMajorNews>(sql.ToString(), paras);
        //    }
        //    catch (Exception e)
        //    {
        //        return null;
        //    }
           
        //}

        public bool UpdTushareMajorNew(string Contents, int Id)
        {
            var sql = $"update TushareMajorNews set  Contents=@Contents where Id=@Id";

 GasolineBlend.Entity/Account.cs

@@ -285,6 +285,16 @@
        public string AlarmWXGrade { get; set; }
    }

    public class AccountMoney
    {
        public double AccountLeft { get; set; }

        public int AccountPayNo { get; set; }

        public int AccountUseNo { get; set; }

    }

    public enum UserRoleType { SuperAdmin, CommonAdmin , User };

    public enum DefaultModeType

 GasolineBlend.Entity/FRMReportInfoDataPage.cs

New file
@@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace GasolineBlend.Entity
{
    public class FRMReportInfoDataPage
    {
        /// <summary>
        /// æ€»è®°å½•æ•°
        /// </summary>
        public int TotalItems { get; set; }

        /// <summary>
        /// æ€»é¡µæ•°
        /// </summary>
        public int TotalPages { get; set; }

        /// <summary>
        /// å½“前页数
        /// </summary>
        public int CurrentPage { get; set; }

        /// <summary>
        /// æ¯é¡µæ¡æ•°
        /// </summary>
        public int PageSize { get; set; }

        public List<FRMReportInfo> ListFrmReportInfos { get; set; }

    }
}

 GasolineBlend.Entity/FinBalanceSheetExDataPage.cs

New file
@@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace GasolineBlend.Entity
{
    public class FinBalanceSheetExDataPage
    {
        /// <summary>
        /// æ€»è®°å½•æ•°
        /// </summary>
        public int TotalItems { get; set; }

        /// <summary>
        /// æ€»é¡µæ•°
        /// </summary>
        public int TotalPages { get; set; }

        /// <summary>
        /// å½“前页数
        /// </summary>
        public int CurrentPage { get; set; }

        /// <summary>
        /// æ¯é¡µæ¡æ•°
        /// </summary>
        public int PageSize { get; set; }

        public List<FinBalanceSheetEx> ListFinBalanceSheetExs { get; set; }

    }
}

 GasolineBlend.Entity/GasolineBlend.Entity.csproj

@@ -82,6 +82,8 @@
    <Compile Include="CustomGoods.cs" />
    <Compile Include="DisclosureDate.cs" />
    <Compile Include="EvaReportExDataPage.cs" />
    <Compile Include="FRMReportInfoDataPage.cs" />
    <Compile Include="FinBalanceSheetExDataPage.cs" />
    <Compile Include="IndustryChainInfo.cs" />
    <Compile Include="IndustryStockListPara.cs" />
    <Compile Include="KnowledgeGraph.cs" />

 GasolineBlend/Controllers/AssessCapitalController.cs

@@ -1,4 +1,4 @@
using System;
 using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

 GasolineBlend/Controllers/ComMonitorController.cs

@@ -2,6 +2,8 @@
using GasolineBlend.BLL;
using GasolineBlend.Entity;
using System;
using System.Data;
using System.IO;
using System.Web.Mvc;
using GasolineBlend.Filter;

@@ -9,6 +11,7 @@
{
    public class ComMonitorController:BaseController
    {
        private readonly string _virtualPathGroup = "../UploadFiles/RRMonitorGroup/";
        private ComMonitorBLL _acc = new ComMonitorBLL();

        /// <summary>
@@ -94,7 +97,7 @@
        }

        /// <summary>
        /// æ–°å¢žä¸€ä¸ªå…¬å¸
        /// æ–°å¢žä¸€ä¸ªç›‘控公司
        /// </summary>
        /// <param name="ReportName"></param>
        /// <param name="ProjectId"></param>
@@ -104,14 +107,6 @@
        {
            try
            {
                //int m = OperatorProvider.Instance.Current.UserId;
                ComMonitor comMonitor = new ComMonitor()
                {
                    CompanyId = 0,//冗余字段
                    CompanyName = CompanyName,
                    MonitorGroupId = MonitorGroupId,
                    UserId = UserId
                };
                AccountBLL _accountBll = new AccountBLL();
                SysBusinessPlanBLL _sysBusinessPlanBll = new SysBusinessPlanBLL();
                var userGrade = _accountBll.GetUserGradeById(UserId);
@@ -129,9 +124,15 @@
                {
                    return Error($"操作失败！您当前使用{UserGradeType.VIP.GetDisplayName()}，最多可以添加{vipDescNo}家监控企业！如需获取更多额度请咨询在线客服！", true, ShowDetail.ModalWarning.GetDisplayName());
                }

                else
                {
                    ComMonitor comMonitor = new ComMonitor()
                    {
                        CompanyId = 0,//冗余字段
                        CompanyName = CompanyName,
                        MonitorGroupId = MonitorGroupId,
                        UserId = UserId
                    };
                    if (_acc.ExistComMonitor(comMonitor, false) == false)
                    {
                        comMonitor.CompanyState = 1;
@@ -150,10 +151,134 @@
            catch (Exception e)
            {

                LogHelper.Write(Level.Error, "新增一个公司 AddComMonitor", e, OperatorProvider.Instance.Current==null?"GuestEx":OperatorProvider.Instance.Current.LoginName);
                LogHelper.Write(Level.Error, "新增一个监控公司 AddComMonitor", e, OperatorProvider.Instance.Current==null?"GuestEx":OperatorProvider.Instance.Current.LoginName);
                return Error();
            }
        }

        /// <summary>
        /// æ‰¹é‡å¯¼å…¥ç›‘控公司
        /// </summary>
        /// <param name="UserId"></param>
        /// <param name="MonitorGroupId"></param>
        /// <returns></returns>
        [HttpPost]
        public ActionResult AddComMonitorPatch(int UserId, int MonitorGroupId=0)
        {
            try
            {
                AssessFileBLL assessFileBll = new AssessFileBLL();
                //检查状态是否正常
                if (!ModelState.IsValid)
                    return Error(ModelState.Values);

                Stream stream = Request.InputStream;
                StreamReader streamReader = new StreamReader(stream);
                var json = streamReader.ReadToEnd();
                if (string.IsNullOrWhiteSpace(json))
                    return Error("上传请求参数为空！");
                if (HttpContext.Request.Files.Count != 1)
                    return Error("系统只允许上传一个文件！请重新上传！");

                for (int i = 0; i < HttpContext.Request.Files.Count; i++)
                {
                    var uploadFile = HttpContext.Request.Files[i]; //上传文件
                    if (uploadFile == null)
                        return Error("当前上传的文件为空文件！请重新上传！");

                    FileInfo file = new FileInfo(uploadFile.FileName);
                    string fileName = uploadFile.FileName.Replace(file.Extension, "");
                    if (uploadFile.InputStream.Length == 0)
                        return Error(fileName + "的文件内容为空！请重新上传！");

                    if (assessFileBll.GetFileType(file.Extension) != "Excel")
                        return Error(fileName + "的文件类型系统不支持！请重新上传！");

                    if (uploadFile.InputStream.Length > 104857600) //1024*1024*100=100M
                        return Error(fileName + "的文件大小已经超过100M！请重新上传！");
                }

                int iSuccessNo = 0;
                int iEmptyNo = 0;
                for (int i = 0; i < HttpContext.Request.Files.Count; i++)
                {
                    //获取导入文件清单
                    var createTime = DateTime.Now.ToString("yyyyMMddHHmm");
                    var uploadFile = HttpContext.Request.Files[i]; //上传文件
                    var filename =
                        Server.MapPath(string.Format("{0}【{1}】{2}", _virtualPathGroup, createTime, uploadFile.FileName));
                    Directory.CreateDirectory(Server.MapPath(_virtualPathGroup));
                    uploadFile.SaveAs(filename);
                    DataTable dtNew = NPOIHelper.Import(filename);
                    if (dtNew != null && dtNew.Rows.Count >= 1)
                    {
                        //判断是否符合套餐
                        AccountBLL _accountBll = new AccountBLL();
                        SysBusinessPlanBLL _sysBusinessPlanBll = new SysBusinessPlanBLL();
                        var userGrade = _accountBll.GetUserGradeById(UserId);
                        var freeDescNo = _sysBusinessPlanBll.GetFreeDescbyName("自选成员");
                        var vipDescNo = _sysBusinessPlanBll.GetVipDescbyName("自选成员");
                        var comMonitorMemberNo = _acc.GetComMonitorMemberNo(MonitorGroupId);
                        var dtNewNo = dtNew.Rows.Count;//待优化
                        //普通用户
                        if (userGrade == UserGradeType.Free.GetDisplayName() && comMonitorMemberNo+ dtNewNo >= freeDescNo)
                        {
                            return Error($"操作失败！您当前使用{UserGradeType.Free.GetDisplayName()}，最多可以添加{freeDescNo}家监控企业！如需获取更多额度请咨询在线客服！", true, ShowDetail.ModalWarning.GetDisplayName());
                        }
                        //VIP用户
                        else if (userGrade == UserGradeType.VIP.GetDisplayName() && comMonitorMemberNo+ dtNewNo >= vipDescNo)
                        {
                            return Error($"操作失败！您当前使用{UserGradeType.VIP.GetDisplayName()}，最多可以添加{vipDescNo}家监控企业！如需获取更多额度请咨询在线客服！", true, ShowDetail.ModalWarning.GetDisplayName());
                        }
                        else 
                        {
                            for (int j = 0; j < dtNew.Rows.Count; j++)
                            {
                                if (dtNew.Rows[j][0].ToString() != "")
                                {
                                    //批量添加公司
                                    ComMonitor comMonitor = new ComMonitor()
                                    {
                                        CompanyId = 0,//冗余字段
                                        CompanyName = dtNew.Rows[j][0].ToString(),
                                        MonitorGroupId = MonitorGroupId,
                                        UserId = UserId
                                    };
                                    if (_acc.ExistComMonitor(comMonitor, false) == false)
                                    {
                                        comMonitor.CompanyState = 1;
                                        _acc.AddComMonitor(comMonitor);
                                    }
                                    iSuccessNo++;
                                }
                                else
                                {
                                    iEmptyNo++;
                                }
                            }
                        }
                    }
                    else
                    {
                        return Error();
                    }
                    break;//第一个文件完成就跳出
                }
                return Success($"批量导入已完成！成功导入{iSuccessNo}家公司！");

            }
            catch (Exception e)
            {
                LogHelper.Write(Level.Error, "批量导入监控公司 AddComMonitorPatch", e, OperatorProvider.Instance.Current == null ? "GuestEx" : OperatorProvider.Instance.Current.LoginName);
                return Error();
            }
        }

        /// <summary>
        /// æ£€æŸ¥å½“前公司是否存在
        /// </summary>
        /// <param name="Name"></param>
        /// <returns></returns>
        public ActionResult CheckComMonitor(string Name)
        {
            try

 GasolineBlend/Controllers/EvaReportExController.cs

@@ -7,6 +7,8 @@
using System.Threading.Tasks;
using System.Web;
using System.Web.Mvc;
using RiskControl.NewService.Entity.RiskControlRR;
using RiskControl.NewService.Service;

namespace GasolineBlend.Controllers
{
@@ -145,6 +147,28 @@
                    {
                        string LingoModelPath = Server.MapPath(Configs.LingoM1Path);
                        _acc.GetCashRAROCListAsync(RId, account,LingoModelPath);
                        //消耗积分存入系统20230525FX
                        var UserId = OperatorProvider.Instance.Current.UserId;
                        UseOrderService _orderService = new UseOrderService();
                        SysBusinessPlanBLL _sysBusinessPlanBll = new SysBusinessPlanBLL();
                        var userGrade = accountBll.GetUserGradeById(UserId);
                        var freeDescNo = _sysBusinessPlanBll.GetFreeDescbyName("公司财报智风控");
                        var vipDescNo = _sysBusinessPlanBll.GetVipDescbyName("公司财报智风控");
                        UseOrder param = new UseOrder();
                        param.CreateUserId = UserId;
                        param.OrderType = "公司财报智风控";
                        param.OrderNo = Guid.NewGuid().ToString("N");
                        if (userGrade == UserGradeType.Free.GetDisplayName()) //普通版
                        {
                            param.OrderAmount = freeDescNo;
                            param.PayAmount = freeDescNo;
                        }
                        else
                        {
                            param.OrderAmount = vipDescNo;
                            param.PayAmount = vipDescNo;
                        }
                         _orderService.AddAsync(param,false);
                        return SuccessNoShow(data: "OK");
                    }
                    else

 GasolineBlend/Controllers/EventKgController.cs

@@ -7,6 +7,7 @@
using GasolineBlend.Entity;
using RiskControl.NewService.Entity.RRAutoBIDB;
using RiskControl.NewService.Service;
using RiskControl.NewService.ViewModel;
using SqlSugar;

namespace GasolineBlend.Controllers
@@ -94,6 +95,24 @@
        }

        /// <summary>
        /// èŽ·å–风险、新闻、公告检测的预警数(首页自选)
        /// </summary>
        /// <param name="startTime"></param>
        /// <param name="endTime"></param>
        /// <param name="groupId1"></param>
        /// <param name="groupId2"></param>
        /// <returns></returns>
        public ActionResult GetRiskMonitorWarnCountResult2(DateTime? startTime, DateTime? endTime, int groupId1, int groupId2)
        {
            var res1 = _alarmService.GetRiskMonitorWarnCountResult(startTime, endTime, groupId1);
            var res2 = _alarmService.GetRiskMonitorWarnCountResult(startTime, endTime, groupId2);
            List<RiskMonitorWarnCountResult> listRiskMonitorWarnCountResults = new List<RiskMonitorWarnCountResult>();
            listRiskMonitorWarnCountResults.Add(res1);
            listRiskMonitorWarnCountResults.Add(res2);
            return SuccessNoShow(data: listRiskMonitorWarnCountResults);
        }

        /// <summary>
        /// æ ¹æ®é£Žé™©ã€æ–°é—»ã€å…¬å‘Šæ£€æµ‹èŽ·å–预警详情
        /// </summary>
        /// <param name="startTime">开始时间</param>

 GasolineBlend/Controllers/FRMReportInfoController.cs

@@ -5,14 +5,13 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Web;
using System.Web.Mvc;
using RiskControl.NewService.Entity.RiskControlRR;
using RiskControl.NewService.Service;

namespace GasolineBlend.Controllers
{
@@ -22,18 +21,18 @@
        private readonly string _excelPath = "../FRMReport/Excel/";
        private readonly string _savePath = "FRMReport/Excel/";
        private FRMReportInfoBLL _acc = new FRMReportInfoBLL();
        //private readonly string _virtualPathGroup = "../UploadFiles/RRMonitorGroup/";
        /// <summary>
        ///获取报告列表
        /// </summary>
        /// <param name="ProjId"></param>
        /// <returns></returns>
        [HttpPost]
        //[LoginChecked(false)]
        public ActionResult GetReportList(string UserId="")
        public ActionResult GetReportList(int PageIndex=1,int PageSize=5,string UserId="")
        {
            try
            {
                var list = _acc.GetFRMReportlist(UserId);
                var list = _acc.GetFRMReportlist(PageIndex,PageSize,UserId);
                return SuccessNoShow(data: list);
            }
            catch (Exception e)
@@ -70,24 +69,18 @@
        /// <param name="sid"></param>
        /// <returns></returns>
        [HttpPost]
        //[LoginChecked(false)]
        public ActionResult AddImg(string UserId)
        public async Task<ActionResult> AddImg2(string UserId)
        {
            try
            {
                //初始化FRMReportInfoç±»
                FRMReportInfo fRMReportInfo = new FRMReportInfo();
                fRMReportInfo.UserId = UserId;
                //检查状态是否正常
                if (!ModelState.IsValid)
                    return Error(ModelState.Values);

                //Stream stream = Request.InputStream;
                //StreamReader streamReader = new StreamReader(stream);
                //var json = streamReader.ReadToEnd();
                //if (string.IsNullOrWhiteSpace(json))
                //    return Error("上传请求参数为空！");
                if (HttpContext.Request.Files.Count == 0)
                    return Error("上传请求文件为0！");
                FRMReportInfo fRMReportInfo = new FRMReportInfo();
                fRMReportInfo.UserId = UserId;
                if (HttpContext.Request.Files.Count > 0)
                {
                    for (int i = 0; i < HttpContext.Request.Files.Count; i++)
@@ -158,7 +151,7 @@
                        }
                        else
                        {
                            return Error("图片智能识别结果为空!");
                            return Error("识别失败！图片智能识别结果为空！");
                        }
                        bool result = _acc.AddFRMReport(fRMReportInfo);
                        // ä¿å­˜å¤±è´¥ä¿®æ”¹æ–‡ä»¶å
@@ -172,6 +165,30 @@
                            }
                            System.IO.File.Move(filename, newName);
                            return Error("保存文件失败！");
                        }
                        else
                        {
                            UseOrderService _orderService = new UseOrderService();
                            AccountBLL _accountBll = new AccountBLL();
                            SysBusinessPlanBLL _sysBusinessPlanBll = new SysBusinessPlanBLL();
                            var userGrade = _accountBll.GetUserGradeById(int.Parse(UserId));
                            var freeDescNo = _sysBusinessPlanBll.GetFreeDescbyName("公司财报OCR");
                            var vipDescNo = _sysBusinessPlanBll.GetVipDescbyName("公司财报OCR");
                            UseOrder param = new UseOrder();
                            param.CreateUserId = int.Parse(UserId);
                            param.OrderType = "公司财报OCR";
                            param.OrderNo = Guid.NewGuid().ToString("N");
                            if (userGrade == UserGradeType.Free.GetDisplayName()) //普通版
                            {
                                param.OrderAmount = freeDescNo;
                                param.PayAmount = freeDescNo;
                            }
                            else
                            {
                                param.OrderAmount = vipDescNo;
                                param.PayAmount = vipDescNo;
                            }
                            await _orderService.AddAsync(param);
                        }
                    }
                    return Success(data:fRMReportInfo.ReportPath);
@@ -189,8 +206,12 @@
        }

        [HttpPost]
        public async Task<ActionResult> AliOcrTable()
        public async Task<ActionResult> AddImg(string UserId)
        {
            //初始化FRMReportInfoç±»
            FRMReportInfo fRMReportInfo = new FRMReportInfo();//创建记录
            fRMReportInfo.UserId = UserId;

            if (HttpContext.Request.Files.Count == 0)
                return Error("上传请求文件为0！");
            if (HttpContext.Request.Files.Count != 1)
@@ -203,17 +224,89 @@
                return Error("只能上传图片！请重新上传！");
            if (uploadFile.InputStream.Length > 4 * 1024 * 1024) //1024*1024*100=100M--前端验证
                return Error("文件大小已经超过4M！请重新上传！");

            var createTime = DateTime.Now.ToString("yyyyMMddHHmm");//创建时间
            var filepath = string.Format("{0}【{1}】{2}", _virtualPath, createTime,
                uploadFile.FileName);
            var filename =
                Server.MapPath(string.Format("{0}【{1}】{2}", _virtualPath, createTime, uploadFile.FileName));
            Directory.CreateDirectory(Server.MapPath(_virtualPath));
            uploadFile.SaveAs(filename);
            fRMReportInfo.ImgPath = filepath;

            byte[] bytes;
            using (var memoryStream = new MemoryStream())
            {
                uploadFile.InputStream.CopyTo(memoryStream);
                bytes = memoryStream.ToArray();
            }

            var base64Str = Convert.ToBase64String(bytes);
            var table = await ResultsIdentifyBLL.AliOcrTable(base64Str);
            
            return Success(data: table);
            if (table != null)
            {
                string fileName = uploadFile.FileName.Replace(file.Extension, "");
                fRMReportInfo.ImgName = fileName;
                var title = "OCR_" + DateTime.Now.ToString("yyyyMMddhhmmssfff");
                var ExcelPath = string.Format("{0}【{1}】{2}", _savePath, createTime,
                    title.ToString() + ".xlsx");
                var ExcelPathShow = string.Format("{0}【{1}】{2}", _savePath, createTime,
                    title.ToString() + "_Show" + ".xlsx");
                var RealPath = Server.MapPath(string.Format("{0}【{1}】{2}", _excelPath, createTime,
                    title.ToString() + ".xlsx"));
                Directory.CreateDirectory(Server.MapPath(_excelPath));
                NPOIHelper.FRMExportExcel(table, RealPath, title, true);
                fRMReportInfo.ReportName = title + ".xlsx";
                fRMReportInfo.ReportPath = ExcelPath;
                fRMReportInfo.ReportPath_Show = ExcelPathShow;
            }
            else
            {
                return Error("识别失败！图片智能识别结果为空！");
            }

            bool result = _acc.AddFRMReport(fRMReportInfo);
            // ä¿å­˜å¤±è´¥ä¿®æ”¹æ–‡ä»¶å
            if (!result)
            {
                if (System.IO.File.Exists(filename))
                {
                    var newName = Regex.Replace(filename, @"【\d*】", $"【保存失败{DateTime.Now:yyyyMMdd}】");
                    //文件名重复,删除之前的
                    if (System.IO.File.Exists(newName))
                    {
                        System.IO.File.Delete(newName);
                    }
                    System.IO.File.Move(filename, newName);
                }
                return Error("保存文件失败！");
            }
            else
            {
                //消耗积分存入系统20230525FX
                UseOrderService _orderService = new UseOrderService();
                AccountBLL _accountBll = new AccountBLL();
                SysBusinessPlanBLL _sysBusinessPlanBll = new SysBusinessPlanBLL();
                var userGrade = _accountBll.GetUserGradeById(int.Parse(UserId));
                var freeDescNo = _sysBusinessPlanBll.GetFreeDescbyName("公司财报OCR");
                var vipDescNo = _sysBusinessPlanBll.GetVipDescbyName("公司财报OCR");
                UseOrder param = new UseOrder();
                param.CreateUserId = int.Parse(UserId);
                param.OrderType = "公司财报OCR";
                param.OrderNo = Guid.NewGuid().ToString("N");
                if (userGrade == UserGradeType.Free.GetDisplayName()) //普通版
                {
                    param.OrderAmount = freeDescNo;
                    param.PayAmount = freeDescNo;
                }
                else
                {
                    param.OrderAmount = vipDescNo;
                    param.PayAmount = vipDescNo;
                }
                await _orderService.AddAsync(param);
                return Success(data: fRMReportInfo.ReportPath);
            }

        }

        /// <summary>

 GasolineBlend/Controllers/FinBalanceSheetExController.cs

@@ -12,7 +12,6 @@
    public class FinBalanceSheetExController:BaseController
    {
        private FinBalanceSheetExBLL _acc = new FinBalanceSheetExBLL();
        //private FinBalanceSheetBLL _accNew = new FinBalanceSheetBLL();

        /// <summary>
        ///根据主体ID查询资产负债表
@@ -20,11 +19,11 @@
        /// <param name="ProjId"></param>
        /// <returns></returns>
        [HttpPost]
        public ActionResult GetBalanceSheetList( int SubjectId, int ProjId)
        public ActionResult GetBalanceSheetList( int SubjectId, int ProjId, int PageIndex=1, int PageSize=5)
        {
            try
            {
                var list = _acc.GetBalanceSheetList(SubjectId, ProjId);
                var list = _acc.GetBalanceSheetList(SubjectId, ProjId, PageIndex, PageSize);
                return SuccessNoShow(data: list);
            }
            catch (Exception e)
@@ -34,25 +33,6 @@
            }
        }

        /// <summary>
        ///根据主体ID查询资产负债表（Drop）
        /// </summary>
        /// <param name="ProjId"></param>
        /// <returns></returns>
        //[HttpPost]
        //public ActionResult GetBalanceSheetListEx(int SubjectId, int ProjId)
        //{
        //    try
        //    {
        //        var list = _accNew.GetBalanceSheetList(SubjectId,  ProjId);
        //        return SuccessNoShow(data: list);
        //    }
        //    catch (Exception e)
        //    {
        //        LogHelper.Write(Level.Error, "获取资产负债表的列表 GetBalanceSheetList", e, OperatorProvider.Instance.Current == null ? "GuestEx" : OperatorProvider.Instance.Current.LoginName);
        //        return Error();
        //    }
        //}
        #region æŸ¥è¯¢ 3项
        /// <summary>
        ///根据主体ID æ ¹æ®æ¡ä»¶èŽ·å– æŠ¥è¡¨ç±»åž‹

 GasolineBlend/Controllers/MkPledgeRevController.cs

@@ -18,11 +18,11 @@
        /// </summary>
        /// <returns></returns>
        [HttpPost]
        public async Task<ActionResult> GetPledgeRevList(int PageSize = 5, int PageIndex = 1, string Name = "", int SelState = 0, int TypeId = 0 , string NameOfMortgagor = "", string NameOfMortgagee = "", string PriContractAmount = "", string sizeAll = "", string[] RegistrationTime = null, string[] DateOfRegistration = null, string RegCerNumber="", bool SubLtdFlag = true)
        public async Task<ActionResult> GetPledgeRevList(int PageSize = 5, int PageIndex = 1, string Name = "", int SelState = 0, int TypeId = 0 , string NameOfMortgagor = "", string NameOfMortgagee = "", string PriContractAmount = "", string RegistrationType= "", string[] RegistrationTime = null, string[] DateOfRegistration = null, string RegCerNumber="", bool SubLtdFlag = true)
        {
            try
            {
                var list = await _acc.GetPledgeRevList(PageSize, PageIndex,FileUtil.ToSBC(Name), SelState, TypeId, FileUtil.ToSBC(NameOfMortgagor), FileUtil.ToSBC(NameOfMortgagee), PriContractAmount, sizeAll, RegistrationTime, DateOfRegistration,RegCerNumber,SubLtdFlag);
                var list = await _acc.GetPledgeRevList(PageSize, PageIndex,FileUtil.ToSBC(Name), SelState, TypeId, FileUtil.ToSBC(NameOfMortgagor), FileUtil.ToSBC(NameOfMortgagee), PriContractAmount, RegistrationType, RegistrationTime, DateOfRegistration,RegCerNumber,SubLtdFlag);
                //记录搜索行为20220831FX
                var userid = OperatorProvider.Instance.Current == null
                    ? -1

 GasolineBlend/Controllers/SubjectExController.cs

@@ -71,7 +71,11 @@
                subject.StateId = StateId;
                subject.TypeAdd = _acc.UpdateTypeAdd(TypeAdd, Title);
                subject.id = id;
                if (RootFlag && _acc.CheckRootNodeInStock(subject, false))
                if (ProjId==0)
                {
                    return Error("项目主体添加失败！请先创建项目再添加！", true, ShowDetail.ModalError.GetDisplayName());
                }
                else if (RootFlag && _acc.CheckRootNodeInStock(subject, false))
                {
                    return Error("当前公司在评估基准日股权结构中存在直接股东！不允许作为根节点！", true, ShowDetail.ModalError.GetDisplayName());
                }
@@ -83,30 +87,6 @@
                        {

                            var rev = _acc.UpdateSubject(subject);
                            //if (rev)
                            //{
                            //    //1. å°†è‚¡æƒå®Œæ•´æ€§æ£€æŸ¥ç»“果存入mainProject表格 / mainSuject表
                            //    RightStockBLL rightStockBll = new RightStockBLL();
                            //    rightStockBll.UpdateRightStockIntegrity(ProjId, false);

                            //    //2. å¦‚果节点的标识发生变化 æˆ– æ ¹èŠ‚点的属性发生变化 
                            //    SubjectEx subjectold = _acc.GetSubjectbyId(id);
                            //    if (subjectold.RootFlag != RootFlag ||
                            //        (subjectold.RootFlag && subjectold.CompanyCharId != CompanyCharId))
                            //    {
                            //        //根节点变化直接影响转换公式中的企业性质调整系数，所以预计损失比率要更新一次，连带着预计损失金额、久期、评估基准日支付金额一起更新
                            //        AssessDebtOutBLL assessDebtOutBll = new AssessDebtOutBLL();
                            //        assessDebtOutBll.UpdateDurationDiscountAll(ProjId);
                            //    }

                            //    //3. å¦‚果根节点标识为true
                            //    if (subjectold.RootFlag != RootFlag)
                            //    {
                            //        //节点的股权完整性Flag与根节点Flag一致
                            //        _acc.UpdateSubject(id, RootFlag);
                            //    }
                            //}

                            return rev ? Success() : Error();
                        }
                        else
@@ -122,18 +102,6 @@
                            //添加新的节点信息
                            subject.StockIntegrityFlag = RootFlag;//节点的股权完整性Flag与根节点Flag一致
                            var rev = _acc.AddSubject(subject);
                            //if (rev > 0)
                            //{
                            //    //1. å°†è‚¡æƒå®Œæ•´æ€§æ£€æŸ¥ç»“果存入mainProject表格 / mainSuject表
                            //    RightStockBLL rightStockBll = new RightStockBLL();
                            //    rightStockBll.UpdateRightStockIntegrity(ProjId, false);

                            //    //2. æ·»åŠ ç»¼åˆä¿¡æ¯æŠ¥å‘Š
                            //    AssessGeneralInfoBLL assessGeneralInfoBll = new AssessGeneralInfoBLL();
                            //    AssessGeneralInfo assessGeneralInfo = new AssessGeneralInfo();
                            //    assessGeneralInfo.CompanyId = rev;
                            //    assessGeneralInfoBll.AddGeneralInfo(assessGeneralInfo);
                            //}
                            return rev > 0 ? Success() : Error();
                        }
                        else
@@ -143,7 +111,6 @@
                        }
                    }
                }

            }
            catch (Exception e)
            {
@@ -228,7 +195,7 @@
                SubjectEx subject = _acc.GetSubjectbyId(id);
                ProjectExBLL projectBll = new ProjectExBLL();
                ProjectEx project = projectBll.GetProjOverview(subject.ProjId);
                if (project.FirstSubjectId == id)
                if (project!=null && project.FirstSubjectId == id)
                {
                    return Error("删除失败！项目概览>>放款及回收计划>>放款计划的直接融资主体需变更才能删除！");
                }

 GasolineBlend/Controllers/SysAccountMenuController.cs

@@ -53,7 +53,7 @@
        }

        /// <summary>
        /// æ·»åŠ ä¸€æ¡å¸¸ç”¨å·¥å…·ä¿¡æ¯
        /// æ·»åŠ ä¸€æ¡å¸¸ç”¨åŠŸèƒ½ä¿¡æ¯
        /// </summary>
        /// <param name="UserId"></param>
        /// <param name="ToolName"></param>
@@ -63,29 +63,38 @@
        {
            try
            {
                SysAccountMenu sysAccountMenu = new SysAccountMenu();
                sysAccountMenu.UserId = UserId;
                sysAccountMenu.ToolName = ToolName;
                if (_acc.ExistSysAccountMenu(sysAccountMenu, false) == false)
                int iMaxCount = 12;
                if (_acc.GetSysAccountMenuCount(UserId) >= iMaxCount)
                {
                    int res = _acc.AddSysAccountMenu(sysAccountMenu);
                    return res>0?Success(message: "添加成功！"):Error();
                    return Error(message:  $"最多添加{iMaxCount}个功能模块！");
                }
                else
                {
                    return Error(message: "添加失败！已经存在重复项！");
                    SysAccountMenu sysAccountMenu = new SysAccountMenu();
                    sysAccountMenu.UserId = UserId;
                    sysAccountMenu.ToolName = ToolName;
                    if (_acc.ExistSysAccountMenu(sysAccountMenu, false) == false)
                    {
                        int res = _acc.AddSysAccountMenu(sysAccountMenu);
                        return res > 0 ? Success(message: ToolName + "添加成功！") : Error();
                    }
                    else
                    {
                        return Error(message: ToolName + "添加失败！已存在重复项！");
                    }
                }

            }
            catch (Exception e)
            {
                LogHelper.Write(Level.Error, "添加一条常用工具信息 AddSysAccountMenu", e,
                LogHelper.Write(Level.Error, "添加一条常用功能信息 AddSysAccountMenu", e,
                    OperatorProvider.Instance.Current == null ? "GuestEx" : OperatorProvider.Instance.Current.LoginName);
                return Error();
            }
        }

        /// <summary>
        /// åˆ é™¤ä¸€æ¡å¸¸ç”¨å·¥å…·ä¿¡æ¯
        /// åˆ é™¤ä¸€æ¡å¸¸ç”¨åŠŸèƒ½ä¿¡æ¯
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
@@ -95,11 +104,11 @@
            try
            {
                var rev = _acc.DeleteSysAccountMenubyId(id);
                return rev ? Success() : Error();
                return rev ? Success("删除成功！") : Error();
            }
            catch (Exception e)
            {
                LogHelper.Write(Level.Error, "删除一条常用工具信息 DeleteSysAccountMenubyId", e, OperatorProvider.Instance.Current == null ? "GuestEx" : OperatorProvider.Instance.Current.LoginName);
                LogHelper.Write(Level.Error, "删除一条常用功能信息 DeleteSysAccountMenubyId", e, OperatorProvider.Instance.Current == null ? "GuestEx" : OperatorProvider.Instance.Current.LoginName);
                return Error();
            }
        }

 GasolineBlend/Controllers/SysAccountNewsController.cs

@@ -14,11 +14,33 @@
        private SysAccountNewsBLL _acc = new SysAccountNewsBLL();

        /// <summary>
        /// æ ¹æ®UserId和TypeId获取自定义信息
        /// </summary>
        /// <param name="UserId"></param>
        /// <param name="TypeId"></param>
        /// <returns></returns>
        [HttpPost]
        public ActionResult GetSysAccountNewsbyUserId(int UserId, int TypeId)
        {
            try
            {
                var Info = _acc.GetSysAccountNewsbyUserId(UserId, TypeId);
                return SuccessNoShow(data: Info);

            }
            catch (Exception e)
            {
                LogHelper.Write(Level.Error, "根据UserId和TypeId获取自定义信息 GetSysAccountNewsbyUserId", e, OperatorProvider.Instance.Current == null ? "GuestEx" : OperatorProvider.Instance.Current.LoginName);
                return Error();
            }
        }

        /// <summary>
        /// æ·»åŠ ä¸€æ¡è‡ªå®šä¹‰é…ç½®
        /// </summary>
        /// <param name="UserId"></param>
        /// <param name="Keyword"></param>
        /// <param name="TypeId"></param>
        /// <param name="TypeId">1.7*24小时新闻，2.全局新闻</param>
        /// <returns></returns>
        [HttpPost]
        public ActionResult AddSysAccountNews(int UserId, string Keyword,int TypeId)
@@ -29,15 +51,17 @@
                sysAccountNews.UserId = UserId;
                sysAccountNews.Keyword = Keyword;
                sysAccountNews.TypeId = TypeId;
                int res = _acc.AddSysAccountNews(sysAccountNews);
                if (res == 0)
                if (_acc.ExistSysAccountNews(sysAccountNews,false) == false)
                {
                    return Error(message: "添加成功！");
                    int res = _acc.AddSysAccountNews(sysAccountNews);
                    return res > 0 ? Success() : Error();
                }
                else
                {
                    return Error(message: "添加失败！");
                    bool res = _acc.UpdateSysAccountNews(Keyword, UserId, TypeId);
                    return res ? Success() : Error();
                }
                
            }
            catch (Exception e)
            {

 GasolineBlend/Controllers/SysController.cs

@@ -10,7 +10,7 @@

namespace GasolineBlend.Controllers
{
    [LoginChecked()]
    //[LoginChecked()]
    public class SysController : BaseController
    {
        private SysBusinessPlanService _sysBusinessPlanService = new SysBusinessPlanService();
@@ -75,11 +75,23 @@
            for (int i = 0; i < typeList.Count(); i++)
            {
                SysBusinessPlanShow sysBusinessPlanShow = new SysBusinessPlanShow();
                sysBusinessPlanShow.Type = typeList[i].ToString();
                sysBusinessPlanShow.Type = typeList[i];
                sysBusinessPlanShow.SysBusinessPlanList = res.Where(p => p.Type == typeList[i].ToString()).OrderBy(a=>a.OrderId).ToList();
                listSysBusinessPlanShows.Add(sysBusinessPlanShow);
            }
            return SuccessNoShow(data: listSysBusinessPlanShows);
        }

        /// <summary>
        /// ä»è½¯æ™ºç­”GPT是否打开
        /// </summary>
        /// <returns></returns>
        [HttpPost]
        public ActionResult GetRenGPTFlag()
        {
            var sysAppcode = Configs.GetValue("RenGPTFlag");
            bool bFlag = sysAppcode == "1" ? true : false;
            return SuccessNoShow(data: bFlag);
        }
    }
}

 GasolineBlend/Controllers/TushareNewsController.cs

@@ -38,11 +38,11 @@
        /// <param name="ParContent"></param>
        /// <returns></returns>
        [HttpPost]
        public ActionResult GetNewsList(int SubClassId, string ParContent,int PageSize=50, int PageIndex=1)
        public ActionResult GetNewsList(int SubClassId, string ParContent,int PageSize=50, int PageIndex=1,int UserId=0)
        {
            try
            {
                var list = _acc.GetNewsList(SubClassId, ParContent, PageSize, PageIndex);
                var list = _acc.GetNewsList(SubClassId, ParContent, PageSize, PageIndex,UserId);
                return SuccessNoShow(data: list);
            }
            catch (Exception e)
@@ -88,7 +88,7 @@
        {
            try
            {
                var list = _acc.GetNewsList(SubClassId, ParContent, PageSize, PageIndex);
                var list = _acc.GetNewsList(SubClassId, ParContent, PageSize, PageIndex,0);
                return SuccessNoShowNoCheck(data: list);
            }
            catch (Exception e)
@@ -100,6 +100,27 @@
        }

        /// <summary>
        /// æ ¹æ®id获取主要新闻详细信息
        /// </summary>
        /// <param name="Id"></param>
        /// <returns></returns>
        //[HttpPost]
        //public ActionResult GetMajorNewsbyId(int Id)
        //{
        //    try
        //    {
        //        var list = _acc.GetMajorNewsbyId(Id);
        //        return SuccessNoShow(data: list);
        //    }
        //    catch (Exception e)
        //    {

        //        LogHelper.Write(Level.Error, "获取主要新闻详细信息 GetMajorNewsbyId", e, OperatorProvider.Instance.Current == null ? "GuestEx" : OperatorProvider.Instance.Current.LoginName);
        //        return Error();
        //    }
        //}

        /// <summary>
        /// èŽ·å–新闻资讯信息
        /// </summary>
        /// <param name="ParContent"></param>
@@ -107,11 +128,11 @@
        /// <param name="PageIndex"></param>
        /// <returns></returns>
        [HttpPost]
        public ActionResult GetMajorNewsList(string ParContent, int PageSize = 50, int PageIndex = 1)
        public ActionResult GetMajorNewsList(string ParContent, int PageSize = 50, int PageIndex = 1, int UserId = 0)
        {
            try
            {
                var list = _acc.GetMajorNewsList(ParContent, PageSize, PageIndex);
                var list = _acc.GetMajorNewsList(ParContent, PageSize, PageIndex,UserId);
                for (int i = 0; i < list.TrTushareMajorNewses.Count; i++)
                {
                    if (list.TrTushareMajorNewses[i].Contents != null )
@@ -185,7 +206,7 @@
        {
            try
            {
                var list = _acc.GetMajorNewsList(ParContent, PageSize, PageIndex);
                var list = _acc.GetMajorNewsList(ParContent, PageSize, PageIndex,0);
                return SuccessNoShowNoCheck(data: list);
            }
            catch (Exception e)

 GasolineBlend/Controllers/UseController.cs

New file
@@ -0,0 +1,56 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Linq.Expressions;
using System.Threading.Tasks;
using System.Web.Mvc;
using CommonHelper;
using GasolineBlend.Filter;
using RiskControl.NewService.Entity.RiskControlRR;
using RiskControl.NewService.Service;

namespace GasolineBlend.Controllers
{
    /// <summary>
    /// æ¶ˆè´¹ç›¸å…³
    /// </summary>
    [LoginChecked(true)]
    public class UseController : BaseController
    {
        private UseOrderService _orderService = new UseOrderService();

        #region æ¶ˆè´¹è®¢å•

        [HttpPost]
        public async Task<ActionResult> AddOrder(UseOrder param)
        {
            param.CreateUserId = OperatorProvider.Instance.Current.UserId;
            var res = await _orderService.AddAsync(param);
            return SuccessNoShow();
        }

        [HttpPost]
        public async Task<ActionResult> DeleteOrder(int id)
        {
            var res = await _orderService.DeleteAsync(a => a.Id == id);
            return SuccessNoShow();
        }

        [HttpPost]
        public async Task<ActionResult> GetOrderPage(int pageIndex, int pageSize, string orderNo, int CreateUserId
            , DateTime? startTime, DateTime? endTime)
        {
            var res = await _orderService.GetPages(pageIndex, pageSize, orderNo, CreateUserId
                , startTime, endTime);
            return SuccessNoShow(data: res);
        }

        #endregion

        

       
    }
}


 GasolineBlend/Controllers/UserController.cs

@@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Web;
using System.Web.Mvc;
using System.Web.SessionState;
@@ -12,6 +13,8 @@
using GasolineBlend.BLL;
using GasolineBlend.Entity;
using GasolineBlend.Filter;
using RiskControl.NewService.Entity.RiskControlRR;
using RiskControl.NewService.Service;
using RiskControl.NewService.ThirdPartyApi;

namespace GasolineBlend.Controllers
@@ -887,16 +890,41 @@
            }
        }

        
        /// <summary>
        /// èŽ·å–账号的资金情况
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<ActionResult> GetAccountMoney(int id)
        {
            try
            {
                UseOrderService _useOrderService = new UseOrderService();
                PayOrderService _payOrderService=new PayOrderService();
                AccountMoney accountMoney = new AccountMoney();
                var paySum = await _payOrderService.SumAsync(a => a.CreateUserId == id &&a.PaymentStatus==EnumPaymentStatus.Success, "OrderAmount");
                var useSum = await _useOrderService.SumAsync(a => a.CreateUserId == id, "OrderAmount");
                accountMoney.AccountLeft = paySum-useSum;
                accountMoney.AccountPayNo = await _payOrderService.CountAsync(a=>a.CreateUserId==id);
                accountMoney.AccountUseNo = await _useOrderService.CountAsync(a => a.CreateUserId == id);
                return SuccessNoShow(data:accountMoney);
            }
            catch (Exception e)
            {
                LogHelper.Write(Level.Error, "获取账号的资金情况 GetAccountMoney", e, OperatorProvider.Instance.Current == null ? "GuestEx" : OperatorProvider.Instance.Current.LoginName);
                return Error();
            }
        }

       /// <summary>
       /// ç™»å½•æŽ¥å£
       /// </summary>
       /// <param name="userName"></param>
       /// <param name="password"></param>
       /// <param name="companyRemark"></param>
       /// <param name="code">为空-账号登录，不为空-微信登录</param>
       /// <returns></returns>
        /// <summary>
        /// ç™»å½•æŽ¥å£
        /// </summary>
        /// <param name="userName"></param>
        /// <param name="password"></param>
        /// <param name="companyRemark"></param>
        /// <param name="code">为空-账号登录，不为空-微信登录</param>
        /// <returns></returns>
        [HttpPost]
        [LoginChecked(false)]
        public ActionResult Login(string userName, string password, string companyRemark,string code= "")
@@ -1194,7 +1222,6 @@
        {
            if (!new Regex(@"^1\d{10}$").IsMatch(phoneNumber))
                return Error("手机号码格式不正确");
            //var injj =_acc.GetAccountList().Where(p=>p.LoginName=="testfx").FirstOrDefault();
            var userInfo = _acc.GetAccountList().Where(a => a.Mobile == phoneNumber).ToList();
            if (userInfo.Count==0&& hasReg)
                return Error("该手机用户不存在");

 GasolineBlend/FRMReport/Excel/_202305251701_RR20230525050213462.xlsx

Binary files differ

 GasolineBlend/FRMReport/Excel/¡¾202305232048¡¿RR20230523084816260.xlsx

Binary files differ

 GasolineBlend/FRMReport/Img/_202305251701_΢ÐÅͼƬ_20230523202158.png

 GasolineBlend/FRMReport/Img/¡¾202304171615¡¿_20221016211811.png

Binary files differ

 GasolineBlend/FRMReport/Img/¡¾202305232032¡¿Î¢ÐÅͼƬ_20230523202158.png

 GasolineBlend/FRMReport/Img/¡¾202305251726¡¿Î¢ÐÅͼƬ_20230523202158.png

 GasolineBlend/GasolineBlend.csproj

@@ -325,6 +325,7 @@
    <Compile Include="Controllers\MonShareOneController.cs" />
    <Compile Include="Controllers\NeeqController.cs" />
    <Compile Include="Controllers\PageRouteController.cs" />
    <Compile Include="Controllers\UseController.cs" />
    <Compile Include="Controllers\PayController.cs" />
    <Compile Include="Controllers\ProjectController.cs" />
    <Compile Include="Controllers\ProjectExController.cs" />
@@ -417,6 +418,8 @@
  </ItemGroup>
  <ItemGroup>
    <Folder Include="App_Data\" />
    <Folder Include="FRMReport\Excel\" />
    <Folder Include="FRMReport\Img\" />
    <Folder Include="Pages\" />
    <Folder Include="TableFiles\" />
    <Folder Include="TemplateFiles\" />

 GasolineBlend/UploadFiles/RRMonitorGroup/¡¾202306041629¡¿ImportLtd.xlsx

Binary files differ

 GasolineBlend/UploadFiles/RRMonitorGroup/¡¾202306041630¡¿ImportLtd.xls

Binary files differ

 GasolineBlend/UploadFiles/RRMonitorGroup/¡¾202306041631¡¿ImportLtd.xls

Binary files differ

 GasolineBlend/UploadFiles/RRMonitorGroup/¡¾202306041641¡¿ImportLtd.xls

Binary files differ

 GasolineBlend/UploadFiles/RRMonitorGroup/¡¾202306041646¡¿ImportLtd.xls

Binary files differ

 GasolineBlend/Web.config

@@ -78,6 +78,8 @@
    <add key="HYSiteUrl" value="http://huiyan.rensofter.com/" />
    <add key="TPSiteUrl" value="http://47.103.72.27:8030/" />
    <add key="ImgSiteUrl" value="http://101.133.134.71:9001/" />
    <add key="AliOCRKey" value="b77bcd5d997f47ecaee28e359fbcd605" />
    <add key="RenGPTFlag" value="0" />
  </appSettings>
  <system.web>
    <customErrors mode="Off" />

 RiskControl.NewService/Entity/RiskControlRR/UseOrder.cs

New file
@@ -0,0 +1,102 @@
using System;
using System.ComponentModel;
using CommonHelper.Format;
using Newtonsoft.Json;
using SqlSugar;

namespace RiskControl.NewService.Entity.RiskControlRR
{
    /// <summary>
    /// æ¶ˆè´¹è®¢å•
    ///</summary>
    [SugarTable("UseOrder")]
    public class UseOrder
    {
        /// <summary>
        ///  è®¢å•Id
        ///</summary>
        [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
        public int Id { get; set; }
        /// <summary>
        /// è®¢å•ç¼–号 
        ///</summary>
        [SugarColumn(ColumnName = "OrderNo")]
        public string OrderNo { get; set; }
        /// <summary>
        /// è®¢å•ç±»åž‹ 
        ///</summary>
        [SugarColumn(ColumnName = "OrderType")]
        public string OrderType { get; set; }
        /// <summary>
        /// è®¢å•é‡‘额 
        ///</summary>
        [SugarColumn(ColumnName = "OrderAmount")]
        public decimal OrderAmount { get; set; }
        /// <summary>
        /// æ”¯ä»˜é‡‘额 
        ///</summary>
        [SugarColumn(ColumnName = "PayAmount")]
        public double PayAmount { get; set; }
        /// <summary>
        /// åˆ›å»ºæ—¶é—´ 
        /// é»˜è®¤å€¼: (getdate())
        ///</summary>
        [SugarColumn(ColumnName = "CreateTime")]
        public DateTime CreateTime { get; set; } = DateTime.Now;
        /// <summary>
        /// æ”¯ä»˜è´¦æˆ· 
        ///</summary>
        [SugarColumn(ColumnName = "CreateUserId")]
        public int CreateUserId { get; set; }

        [Navigate(NavigateType.OneToOne, nameof(CreateUserId))]
        public SysAccount CreateUser { get; set; }

    }

    

    /// <summary>
    /// æ”¯ä»˜æ–¹å¼
    /// </summary>
    //public enum EnumPayment
    //{
    //    /// <summary>
    //    /// å¾®ä¿¡æ”¯ä»˜
    //    /// </summary>
    //    [Description("微信支付")]
    //    WechatPay = 1,
    //    /// <summary>
    //    /// æ”¯ä»˜å®
    //    /// </summary>
    //    [Description("支付宝")]
    //    AliPay = 2,
    //}

    /// <summary>
    /// æ”¯ä»˜çŠ¶æ€
    /// </summary>
    //public enum EnumPaymentStatus
    //{
    //    /// <summary>
    //    /// æ”¯ä»˜å¤±è´¥
    //    /// </summary>
    //    [Description("支付失败")]
    //    Error = -1,
    //    /// <summary>
    //    /// æ”¯ä»˜æˆåŠŸ
    //    /// </summary>
    //    [Description("支付成功")]
    //    Success =1,
    //    /// <summary>
    //    /// ç­‰å¾…支付
    //    /// </summary>
    //    [Description("等待支付")]
    //    Paying = 2,
    //    /// <summary>
    //    /// å–消支付
    //    /// </summary>
    //    [Description("取消支付")]
    //    Cancel = 3,
    //}
}

 RiskControl.NewService/QiChaCha/QiChaChaApi.cs

@@ -117,14 +117,23 @@
            var url = isProParamTmp
                ? "https://pro.qcc.com/api/yj/ECIV4/SearchWide"
                : "https://api.qichacha.com/FuzzySearch/GetList";
            try
            {
                var header = GetHeader(isProParamTmp);
                query.key = KeySearch;

            var header= GetHeader(isProParamTmp);
            query.key = KeySearch;
                var resStr = HttpMethod.HttpGet(url, header, query);
                var resObj = resStr.ToObject<FuzzySearchReturnTotal>();

            var resStr = HttpMethod.HttpGet(url, header, query);
            var resObj = resStr.ToObject<FuzzySearchReturnTotal>();
                return resObj;
            }
            catch (Exception e)
            {
                var resObj = new FuzzySearchReturnTotal();

            return resObj;
                return resObj;
            }

        }

        /// <summary>

 RiskControl.NewService/RiskControl.NewService.csproj

@@ -160,6 +160,7 @@
    <Compile Include="Entity\CreditRatingReportStar.cs" />
    <Compile Include="Entity\QccDbEntity\SysCompanyOriginalName.cs" />
    <Compile Include="Entity\RiskControlRR\PayErrLog.cs" />
    <Compile Include="Entity\RiskControlRR\UseOrder.cs" />
    <Compile Include="Entity\RiskControlRR\PayOrder.cs" />
    <Compile Include="Entity\RiskControlRR\PayRechargeAmount.cs" />
    <Compile Include="Entity\RiskControlStockDL\BankFjcfTableDetail.cs" />
@@ -523,6 +524,7 @@
    <Compile Include="Service\DbContext.cs" />
    <Compile Include="Service\EventKgService.cs" />
    <Compile Include="Service\IndustryChainService.cs" />
    <Compile Include="Service\UseService.cs" />
    <Compile Include="Service\SmartInvestAlarmService.cs" />
    <Compile Include="Service\LeaseAlarmService.cs" />
    <Compile Include="Service\SmartInvestService.cs" />

 RiskControl.NewService/Service/BaseService.cs

@@ -196,12 +196,18 @@
        }
        #endregion

        #region æŸ¥è¯¢Count
        #region æŸ¥è¯¢Count/Sum
        public async Task<int> CountAsync(Expression<Func<T, bool>> where, bool Async = true)
        {
            var res = Async ? await _dbClient.Queryable<T>().CountAsync(where) : _dbClient.Queryable<T>().Count(where);
            return res;
        }

        public async Task<double> SumAsync(Expression<Func<T, bool>> where, string sumField, bool Async = true)
        {
            var res = Async ? await _dbClient.Queryable<T>().Where(where).SumAsync<double>(sumField) : _dbClient.Queryable<T>().Where(where).Sum<double>(sumField);
            return res;
        }
        #endregion

        #region æ˜¯å¦å­˜åœ¨

 RiskControl.NewService/Service/UseService.cs

New file
@@ -0,0 +1,37 @@
using System;
using System.Linq.Expressions;
using System.Threading.Tasks;
using RiskControl.NewService.Entity.RiskControlRR;
using RiskControl.NewService.Extension;
using SqlSugar;

namespace RiskControl.NewService.Service
{
    /// <summary>
    /// æ”¯ä»˜è®¢å•
    /// </summary>
    public class UseOrderService :BaseService<UseOrder>
    {
        public async Task<Page<UseOrder>> GetPages(int pageIndex, int pageSize, string orderNo, int CreateUserId
            , DateTime? startTime, DateTime? endTime)
        {
            var whereExp = Expressionable.Create<UseOrder>()
                .AndIF(!string.IsNullOrWhiteSpace(orderNo), a => a.OrderNo == orderNo)
                .AndIF(CreateUserId > 0, a => a.CreateUserId == CreateUserId)
                .AndIF(startTime != null, a => a.CreateTime >= startTime)
                .AndIF(endTime != null, a => a.CreateTime <= endTime)
                .ToExpression();

            var res = await RiskControlRRDb.Queryable<UseOrder>()
                .Includes(a => a.CreateUser)
                .Where(whereExp)
                .OrderBy(a=>a.CreateTime,OrderByType.Desc)
                .ToPageAsync(pageIndex, pageSize);
            return res;
        }


    }


}