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

WX

2023-11-21 9a932f91f12a8439d3d684d65030d2fedba3fde6

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

# Conflicts:
#	GasolineBlend/Controllers/RcyController.cs

 GasolineBlend/Controllers/RcyController.cs

@@ -61,7 +61,7 @@
            return SuccessNoShow(data: res);
        }
        /// <summary>
        /// 产业地图+公司详情
        /// 公司详情
        /// </summary>
        /// <param name="pageIndex"></param>
        /// <param name="pageSize"></param>
@@ -75,7 +75,7 @@
            return SuccessNoShow(data: res);
        }
        /// <summary>
        /// 产业地图+公司详情
        /// 公司详情
        /// </summary>
        /// <returns></returns>
        [HttpPost]
@@ -85,6 +85,16 @@
            return SuccessNoShow(data: res);
        }
        /// <summary>
        /// 产业地图
        /// </summary>
        /// <returns></returns>
        [HttpPost]
        public async Task<ActionResult> GetGsxqMapData()
        {
            var res = await _rcyService.GetGsxqMapData();
            return SuccessNoShow(data: res);
        }
        /// <summary>
        /// 
        /// </summary>
        /// <returns></returns>

 RiskControl.NewService/Entity/RCY/RcyGsxq.cs

@@ -44,6 +44,11 @@
        ///</summary>
        [SugarColumn(ColumnName = "sshy")]
        public string Sshy { get; set; }
        /// <summary>
        /// 省份 
        ///</summary>
        [SugarColumn(ColumnName = "sf")]
        public string Sf { get; set; }
    }

}

 RiskControl.NewService/Service/RcyService.cs

@@ -67,7 +67,7 @@
            return res;
        }
        /// <summary>
        /// 产业地图+公司详情
        /// 公司详情
        /// </summary>
        /// <param name="pageIndex"></param>
        /// <param name="pageSize"></param>
@@ -84,7 +84,7 @@
            return res;
        }
        /// <summary>
        /// 产业地图+公司详情
        /// 公司详情
        /// </summary>
        /// <returns></returns>
        public async Task<List<RcyGsxq>> GetGsxqList()
@@ -93,6 +93,18 @@
                .ToListAsync();
            return res;
        }
        /// <summary>
        /// 产业地图
        /// </summary>
        /// <returns></returns>
        public async Task<object> GetGsxqMapData()
        {
            var res = await RiskControlRRDb.Queryable<RcyGsxq>()
                .GroupBy(a => a.Sf)
                .Select(a => new { Name = a.Sf, Value = SqlFunc.AggregateCount(a.Sf) })
                .ToListAsync();
            return res;
        }

        public async Task<Page<object>> GetChainIncomeCostPage(int pageIndex,int pageSize,string exchangeCode)
        {