代码修改

OpenAuth.App/ServiceApp/TaxManage/Response/TaxResponse.cs

@@ -13,6 +13,13 @@ namespace OpenAuth.App.ServiceApp.TaxManage.Response
         public decimal tdmj { get; set; }
     }
 
+    public class TaxgongxianResponse
+    {
+        public string djqmc { get; set; }
+        public decimal fcgx { get; set; }
+        public decimal tdgx { get; set; }
+    }
+
     public class XZQ
     {
         public string djqmc { get; set; }

OpenAuth.App/ServiceApp/TaxManage/TaxManagementApp.cs

@@ -81,7 +81,10 @@ namespace OpenAuth.App.ServiceApp.TaxManage
             //地块总数
             int dkzs = await client.Queryable<TaxZongdi>().CountAsync();
             //企业数量
-            int qysl=await client.Queryable<TaxCompany>().CountAsync();    
+            int qysl=await client.Queryable<TaxCompany>().CountAsync();
+
+            //年度利润总数
+            decimal? ndlr = await client.Queryable<TaxGongxiandi>().Where(r=>r.tjnd==DateTime.Now.Year.ToString())?.SumAsync(r => SqlFunc.IsNull(r.ndgx, 0));
 
 
             return new Response<dynamic>
@@ -92,7 +95,8 @@ namespace OpenAuth.App.ServiceApp.TaxManage
                 {
                     qymj= qymjtotal,
                     dkzs=dkzs,
-                    qysl=qysl
+                    qysl=qysl,
+                    ndlr=ndlr
                 }
             };
         }
@@ -156,6 +160,67 @@ namespace OpenAuth.App.ServiceApp.TaxManage
                 Result = response
             };
         }
+
+        /// <summary>
+        /// 企业收入分乡镇情况
+        /// </summary>
+        /// <returns></returns>
+        public async Task<Response<List<TaxgongxianResponse>>> LoadgongxianChartData()
+        {
+            //获取行政区数据
+            var xzq = await client.Queryable<TaxXzqh>()
+                    .OrderBy(r => r.djqdm)
+                    .GroupBy(r => new { r.djqdm, r.djqmc })
+                    .Select(r => new XZQ
+                    {
+                        djqdm = r.djqdm,
+                        djqmc = r.djqmc,
+                    }).ToListAsync();
+            //获取房屋贡献
+            var fw = await client.Queryable<TaxGongxianfang>()
+                .Where(r=>r.tjnd==DateTime.Now.Year.ToString())
+                .LeftJoin<TaxBuilding>((r, z) => r.zzwbm == z.jzwbm)
+                .GroupBy((r, z) => z.szzdbm)
+                .Select((r, z) => new CompanyData
+                {
+                    name = z.szzdbm,
+                    data = (decimal)SqlFunc.AggregateSumNoNull(r.ndgx)
+                }).ToListAsync();
+
+            //获取宗地贡献
+            var zd = await client.Queryable<TaxGongxiandi>()
+                 .Where(r => r.tjnd == DateTime.Now.Year.ToString())
+                .GroupBy(r => r.sszdbm)
+                .Select(r => new CompanyData
+                {
+                    name = r.sszdbm,
+                    data = (decimal)SqlFunc.AggregateSumNoNull(r.ndgx)
+                }).ToListAsync();
+            List<TaxgongxianResponse> response = new List<TaxgongxianResponse>();
+            foreach (var x in xzq)
+            {
+                TaxgongxianResponse res = new TaxgongxianResponse();
+                res.djqmc = x.djqmc;
+                var fwdata = fw.Where(r => r.name == x.djqdm).FirstOrDefault();
+                if (fwdata != null)
+                {
+                    res.fcgx = Math.Round(fwdata.data, 2);
+                }
+                var dkdata = zd.Where(r => r.name == x.djqdm).FirstOrDefault();
+                if (dkdata != null)
+                {
+                    res.tdgx = Math.Round(dkdata.data, 2);
+                }
+                response.Add(res);
+            }
+
+            return new Response<List<TaxgongxianResponse>>
+            {
+                Code = 200,
+                Message = "success",
+                Result = response
+            };
+        }
         #endregion
 
     }

OpenAuth.WebApi/Controllers/ServiceController/TaxGongxianController.cs

@@ -69,7 +69,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceController
         }
 
         /// <summary>
-        /// 根据所属宗地编码获取地线信息
+        /// 根据所属宗地编码获取土地贡献
         /// </summary>
         /// <param name="sszdbm">所属宗地编码</param>
         /// <returns></returns>
@@ -213,18 +213,18 @@ namespace OpenAuth.WebApi.Controllers.ServiceController
         }
 
         /// <summary>
-        /// 根据所属宗地编码获取地点信息
+        /// 根据建筑物编码获取房屋贡献
         /// </summary>
-        /// <param name="sszdbm">所属宗地编码</param>
+        /// <param name="zzwbm">建筑物编码</param>
         /// <returns></returns>
         [HttpGet]
         [AllowAnonymous]
-        public async Task<Response<List<TaxGongxianfang>>> GetGongxianfangInfoByBM(string sszdbm)
+        public async Task<Response<List<TaxGongxianfang>>> GetGongxianfangInfoByBM(string zzwbm)
         {
             var result = new Response<List<TaxGongxianfang>>();
             try
             {
-                var data = await _comApp.GetGongxianfangInfoByBM(sszdbm);
+                var data = await _comApp.GetGongxianfangInfoByBM(zzwbm);
                 result.Result = data;
             }
             catch (Exception ex)

OpenAuth.WebApi/Controllers/ServiceController/TaxManagementController.cs

@@ -134,6 +134,28 @@ namespace OpenAuth.WebApi.Controllers
             }
             return result;
         }
+
+        /// <summary>
+        /// 获取图表数据（房产贡献，土地贡献）
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task<Response<List<TaxgongxianResponse>>> LoadgongxianChartData()
+        {
+            var result = new Response<List<TaxgongxianResponse>>();
+            try
+            {
+                var data = await _taxApp.LoadgongxianChartData();
+                result = data;
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return result;
+        }
         #endregion
     }
 }