用房/用地相关接口编写

OpenAuth.App/BaseApp/UserManager/UserManagerApp.cs

@@ -511,7 +511,7 @@ namespace OpenAuth.App
         {
             using (var uow = base.UnitWork.CreateContext())
             {
-                foreach (var item in uow.Db.DbMaintenance.GetTableInfoList().Where(r => r.Name.ToLower().StartsWith("tax_tuceng")))
+                foreach (var item in uow.Db.DbMaintenance.GetTableInfoList().Where(r => r.Name.ToLower().StartsWith("tax_gongxian")))
                 {
                     string entityName = item.Name.Substring(0, 1).ToUpper() + item.Name.Substring(1, 2).ToLower() + item.Name.Substring(4, 1).ToUpper() + item.Name.Substring(5).ToLower();/*实体名大写*/
                     //string entityName = "DroneCaseInfoSTHX";
@@ -521,7 +521,7 @@ namespace OpenAuth.App
                     //    db.MappingColumns.Add(col.DbColumnName.ToUpper() /*类的属性大写*/, col.DbColumnName, entityName);
                     //}
                 }
-                uow.Db.DbFirst.Where(r => r.ToLower().StartsWith("tax_tuceng")).IsCreateAttribute().CreateClassFile("E:\\2025\\税源--地图\\code - 副本\\OpenAuth.Repository\\Domain", "OpenAuth.Repository.Domain");
+                uow.Db.DbFirst.Where(r => r.ToLower().StartsWith("tax_gongxian")).IsCreateAttribute().CreateClassFile("E:\\2025\\税源--地图\\code - 副本\\OpenAuth.Repository\\Domain", "OpenAuth.Repository.Domain");
                 uow.Commit();
             }
             return "更新实体成功";

OpenAuth.App/ServiceApp/CompanyManage/TaxCompanyApp.cs

@@ -20,6 +20,7 @@ using NPOI.HSSF.UserModel;
 using NPOI.SS.UserModel;
 using NPOI.XSSF.UserModel;
 using Yitter.IdGenerator;
+using OpenAuth.App.ServiceApp.TaxZongdiManage.Request;
 
 namespace OpenAuth.App.ServiceApp.CompanyManage
 {
@@ -114,6 +115,52 @@ namespace OpenAuth.App.ServiceApp.CompanyManage
             var list = await client.Queryable<TaxCompany>().Where(r => r.shxydm == shxydm).FirstAsync();
             return list;
         }
+
+        /// <summary>
+        /// 获取导出数据信息
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<Response<System.Data.DataTable>> LoadCompanyPageExport(TaxCompanyReq req)
+        {
+            var query = client.Queryable<TaxCompany>()
+                .WhereIF(!string.IsNullOrEmpty(req.shxydm), r => r.shxydm == req.shxydm)
+                .WhereIF(!string.IsNullOrEmpty(req.syrmc), r => r.syrmc.Contains(req.syrmc))
+                .WhereIF(!string.IsNullOrEmpty(req.djqdm), r => r.djqdm == req.djqdm)
+                .WhereIF(!string.IsNullOrEmpty(req.djzqdm), r => r.djzqdm == req.djzqdm)
+                .WhereIF(!string.IsNullOrEmpty(req.frdb), r => r.frdb == req.frdb)
+                .WhereIF(!string.IsNullOrEmpty(req.hy), r => r.hy == req.hy)
+                .WhereIF(!string.IsNullOrEmpty(req.jyzt), r => r.jyzt == req.jyzt)
+                .WhereIF(req.xmgxccmax != null, r => r.xmgxcc < req.xmgxccmax)
+                .WhereIF(req.xmgxccmin != null, r => r.xmgxcc > req.xmgxccmin)
+                .WhereIF(req.gdzcmax != null, r => r.gdzc < req.gdzcmax)
+                .WhereIF(req.gdzcmin != null, r => r.gdzc > req.gdzcmin)
+                .WhereIF(req.cscymax != null, r => r.cscy < req.cscymax)
+                .WhereIF(req.cscymin != null, r => r.cscy > req.cscymin)
+                  .Select<dynamic>(r => new
+                  {
+                      RowNumber = SqlFunc.RowNumber(r.Id),
+                      r.Id,
+                      r.shxydm,
+                      r.syrmc,
+                      r.hy,
+                      r.djqmc,
+                      r.djzqmc,
+                      r.frdb,
+                      r.lxfs,
+                      r.xmgxcc,
+                      r.cscy
+                  });
+
+            var result = await query.ToDataTableAsync();
+
+            return new Response<System.Data.DataTable>
+            {
+                Code = 200,
+                Message = "success",
+                Result = result
+            };
+        }
         #endregion
 
         #region 编辑企业信息

OpenAuth.App/ServiceApp/TaxGongxianManage/TaxGongxianApp.cs

@@ -0,0 +1,269 @@
+using OpenAuth.App.BaseApp.Base;
+using OpenAuth.Repository.Domain;
+using OpenAuth.Repository;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Infrastructure;
+using OpenAuth.App.BasicQueryService;
+using OpenAuth.App.Interface;
+using SqlSugar;
+
+namespace OpenAuth.App.ServiceApp.TaxGongxianManage
+{
+    public  class TaxGongxianApp : SqlSugarBaseApp<TaxGongxiandi, SugarDbContext>
+    {
+        private ISqlSugarClient client;
+        CommonDataManager _commonDataManager;
+
+        #region 构造函数
+        public TaxGongxianApp(
+             CommonDataManager commonDataManager,
+            ISugarUnitOfWork<SugarDbContext> unitWork,
+            ISimpleClient<TaxGongxiandi> repository,
+            IAuth auth,
+            ISqlSugarClient sqlSugarClient
+            ) : base(unitWork, repository, auth)
+        {
+            this.client = sqlSugarClient;
+            _commonDataManager = commonDataManager;
+        }
+        #endregion
+
+        #region  土地贡献
+        #region  获取分页数据列表
+        /// <summary>
+        /// 获取分页列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<Response<PageInfo<List<TaxGongxiandi>>>> LoadGongxiandiPageList(string sszdbm, int page, int limit)
+        {
+            RefAsync<int> totalCount = 0;
+            var query = client.Queryable<TaxGongxiandi>()
+                .WhereIF(!string.IsNullOrEmpty(sszdbm), r => r.sszdbm == sszdbm);
+
+
+            var result = await query.ToPageListAsync(page, limit, totalCount);
+
+            return new Response<PageInfo<List<TaxGongxiandi>>>
+            {
+                Code = 200,
+                Message = "success",
+                Result = new PageInfo<List<TaxGongxiandi>>
+                {
+                    Items = result,
+                    Total = totalCount
+                }
+            };
+        }
+
+        /// <summary>
+        /// 根据id获取单个土地贡献信息
+        /// </summary>
+        /// <param name="gid">土地贡献gid</param>
+        /// <returns></returns>
+        public async Task<TaxGongxiandi> GetGongxiandiInfoById(string id)
+        {
+            var list = await client.Queryable<TaxGongxiandi>().Where(r => r.Id == id).FirstAsync();
+            return list;
+        }
+
+        /// <summary>
+        /// 根据所属宗地编码获取地线信息
+        /// </summary>
+        /// <param name="sszdbm">所属宗地编码</param>
+        /// <returns></returns>
+        public async Task<List<TaxGongxiandi>> GetGongxiandiInfoByBM(string sszdbm)
+        {
+            var list = await client.Queryable<TaxGongxiandi>().Where(r => r.sszdbm == sszdbm).ToListAsync();
+            return list;
+        }
+        #endregion
+
+        #region 编辑土地贡献信息
+        /// <summary>
+        /// 添加土地贡献信息
+        /// </summary>
+        /// <param name="req"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        public async Task<Response<bool>> AddGongxiandi(TaxGongxiandi req)
+        {
+            using (var uow = base.UnitWork.CreateContext())
+            {
+                req.Id=Guid.NewGuid().ToString();
+                bool insert = await uow.TaxGongxiandi.InsertAsync(req);
+                bool flag = uow.Commit();
+
+                return new Response<bool>
+                {
+                    Result = flag && insert,
+                    Message = (flag && insert) == true ? "success" : "error"
+                };
+            }
+        }
+
+
+        /// <summary>
+        /// 修改土地贡献信息
+        /// </summary>
+        /// <param name="req"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        public async Task<Response<bool>> UpdateGongxiandi(TaxGongxiandi req)
+        {
+            using (var uow = base.UnitWork.CreateContext())
+            {
+
+                bool update = await uow.TaxGongxiandi.UpdateAsync(req);
+                bool flag = uow.Commit();
+
+                return new Response<bool>
+                {
+                    Result = flag && update,
+                    Message = (flag && update) == true ? "success" : "error"
+                };
+            }
+        }
+
+        /// <summary>
+        /// 删除土地贡献
+        /// </summary>
+        /// <param name="ids"></param>
+        public async Task<Response<bool>> DeleteGongxiandi(string[] ids)
+        {
+            using (var uow = base.UnitWork.CreateContext())
+            {
+                var delete = await uow.TaxGongxiandi.DeleteAsync(a => ids.Contains(a.Id));
+                var flag = uow.Commit();
+                return new Response<bool>
+                {
+                    Result = flag && delete,
+                    Message = flag && delete == true ? "success" : "error"
+                };
+            }
+        }
+        #endregion
+        #endregion
+
+        #region  房屋贡献
+        #region  获取分页数据列表
+        /// <summary>
+        /// 获取分页列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<Response<PageInfo<List<TaxGongxianfang>>>> LoadGongxianfangPageList(string zzwbm, int page, int limit)
+        {
+            RefAsync<int> totalCount = 0;
+            var query = client.Queryable<TaxGongxianfang>()
+                .WhereIF(!string.IsNullOrEmpty(zzwbm), r => r.zzwbm == zzwbm);
+
+
+            var result = await query.ToPageListAsync(page, limit, totalCount);
+
+            return new Response<PageInfo<List<TaxGongxianfang>>>
+            {
+                Code = 200,
+                Message = "success",
+                Result = new PageInfo<List<TaxGongxianfang>>
+                {
+                    Items = result,
+                    Total = totalCount
+                }
+            };
+        }
+
+        /// <summary>
+        /// 根据id获取单个房屋贡献信息
+        /// </summary>
+        /// <param name="gid">房屋贡献gid</param>
+        /// <returns></returns>
+        public async Task<TaxGongxianfang> GetGongxianfangInfoById(string id)
+        {
+            var list = await client.Queryable<TaxGongxianfang>().Where(r => r.Id == id).FirstAsync();
+            return list;
+        }
+
+        /// <summary>
+        /// 根据所属宗地编码获取地点信息
+        /// </summary>
+        /// <param name="sszdbm">所属宗地编码</param>
+        /// <returns></returns>
+        public async Task<List<TaxGongxianfang>> GetGongxianfangInfoByBM(string zzwbm)
+        {
+            var list = await client.Queryable<TaxGongxianfang>().Where(r => r.zzwbm == zzwbm).ToListAsync();
+            return list;
+        }
+        #endregion
+
+        #region 编辑房屋贡献信息
+        /// <summary>
+        /// 添加房屋贡献信息
+        /// </summary>
+        /// <param name="req"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        public async Task<Response<bool>> AddGongxianfang(TaxGongxianfang req)
+        {
+            using (var uow = base.UnitWork.CreateContext())
+            {
+                req.Id = Guid.NewGuid().ToString();
+                bool insert = await uow.TaxGongxianfang.InsertAsync(req);
+                bool flag = uow.Commit();
+
+                return new Response<bool>
+                {
+                    Result = flag && insert,
+                    Message = (flag && insert) == true ? "success" : "error"
+                };
+            }
+        }
+
+
+        /// <summary>
+        /// 修改房屋贡献信息
+        /// </summary>
+        /// <param name="req"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        public async Task<Response<bool>> UpdateGongxianfang(TaxGongxianfang req)
+        {
+            using (var uow = base.UnitWork.CreateContext())
+            {
+
+                bool update = await uow.TaxGongxianfang.UpdateAsync(req);
+                bool flag = uow.Commit();
+
+                return new Response<bool>
+                {
+                    Result = flag && update,
+                    Message = (flag && update) == true ? "success" : "error"
+                };
+            }
+        }
+
+        /// <summary>
+        /// 删除房屋贡献
+        /// </summary>
+        /// <param name="ids"></param>
+        public async Task<Response<bool>> DeleteGongxianfang(string[] ids)
+        {
+            using (var uow = base.UnitWork.CreateContext())
+            {
+                var delete = await uow.TaxGongxianfang.DeleteAsync(a => ids.Contains(a.Id));
+                var flag = uow.Commit();
+                return new Response<bool>
+                {
+                    Result = flag && delete,
+                    Message = flag && delete == true ? "success" : "error"
+                };
+            }
+        }
+        #endregion
+        #endregion
+    }
+}

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

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.App.ServiceApp.TaxManage.Response
+{
+    public class TaxResponse
+    {
+        public string djqmc { get; set; }
+        public decimal fcmj { get; set; }
+        public decimal tdmj { get; set; }
+    }
+
+    public class XZQ
+    {
+        public string djqmc { get; set; }
+        public string djqdm { get; set; }
+    }
+
+    public class CompanyData
+    {
+        public string name { get; set; }
+        public decimal data { get; set; }
+    }
+
+}

OpenAuth.App/ServiceApp/TaxManage/TaxManagementApp.cs

@@ -8,6 +8,10 @@ using System.Text;
 using System.Threading.Tasks;
 using OpenAuth.App.Interface;
 using SqlSugar;
+using Infrastructure;
+using OpenAuth.App.ServiceApp.CompanyManage.Request;
+using OpenAuth.App.ServiceApp.TaxManage.Response;
+using NPOI.SS.Formula.Functions;
 
 namespace OpenAuth.App.ServiceApp.TaxManage
 {
@@ -59,5 +63,100 @@ namespace OpenAuth.App.ServiceApp.TaxManage
         }
         #endregion
 
+        #region 图表数据查询
+        /// <summary>
+        /// 查询地图数据
+        /// </summary>
+        /// <returns></returns>
+        public async Task<Response<dynamic>> LoadMapTotalData()
+        {
+            //区域面积
+            decimal? qymj = await client.Queryable<TaxZongdi>()?.SumAsync(r => SqlFunc.IsNull(r.zdfzmj,0));
+           
+            decimal qymjtotal = 0;
+            if (qymj != null)
+            {
+                qymjtotal = Math.Round((decimal)qymj / 1000, 2);
+            }
+            //地块总数
+            int dkzs = await client.Queryable<TaxZongdi>().CountAsync();
+            //企业数量
+            int qysl=await client.Queryable<TaxCompany>().CountAsync();    
+
+
+            return new Response<dynamic>
+            {
+                Code = 200,
+                Message = "success",
+                Result = new 
+                {
+                    qymj= qymjtotal,
+                    dkzs=dkzs,
+                    qysl=qysl
+                }
+            };
+        }
+
+        /// <summary>
+        /// 查询图表数据
+        /// </summary>
+        /// <returns></returns>
+        public async Task<Response<List<TaxResponse>>> LoadChartData()
+        {
+            //获取行政区数据
+            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<TaxBuilding>()
+                .LeftJoin<TaxZongdi>((r, z) => r.szzdbm == z.zdbm)
+                .GroupBy((r, z) => z.djqdm)
+                .Select((r, z) => new CompanyData
+                {
+                    name=z.djqdm,
+                    data=(decimal)SqlFunc.AggregateSumNoNull(r.jzwfzmj)
+                }).ToListAsync();
+
+            //获取宗地面积
+            var zd = await client.Queryable<TaxZongdi>()
+                
+                .GroupBy(r => r.djqdm)
+                .Select(r => new CompanyData
+                {
+                    name = r.djqdm,
+                    data = (decimal)SqlFunc.AggregateSumNoNull(r.zdfzmj)
+                }).ToListAsync();
+            List<TaxResponse> response = new List<TaxResponse>();
+            foreach ( var x in xzq)
+            {
+                TaxResponse res = new TaxResponse();
+                res.djqmc = x.djqmc;
+                var fwdata=fw.Where(r=>r.name== x.djqdm).FirstOrDefault();
+                if(fwdata != null)
+                {
+                    res.fcmj = Math.Round(fwdata.data,2);
+                }
+                var dkdata=zd.Where(r=>r.name==x.djqdm).FirstOrDefault();
+                if (dkdata != null) 
+                {
+                    res.tdmj=Math.Round(dkdata.data,2);
+                }
+                response.Add(res);
+            }
+
+            return new Response<List<TaxResponse>>
+            {
+                Code = 200,
+                Message = "success",
+                Result = response
+            };
+        }
+        #endregion
+
     }
 }

OpenAuth.Repository/Domain/TaxGongxiandi.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace OpenAuth.Repository.Domain
+{
+    ///<summary>
+    ///
+    ///</summary>
+    [SugarTable("tax_gongxiandi")]
+    public partial class TaxGongxiandi
+    {
+           public TaxGongxiandi(){
+
+
+           }
+           /// <summary>
+           /// Desc:主键
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(IsPrimaryKey=true)]
+           public string Id {get;set;}
+
+           /// <summary>
+           /// Desc:所属宗地编码
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string sszdbm {get;set;}
+
+           /// <summary>
+           /// Desc:统计年度
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string tjnd {get;set;}
+
+           /// <summary>
+           /// Desc:年度贡献
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? ndgx {get;set;}
+
+           /// <summary>
+           /// Desc:备注
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string bz {get;set;}
+
+    }
+}

OpenAuth.Repository/Domain/TaxGongxianfang.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace OpenAuth.Repository.Domain
+{
+    ///<summary>
+    ///
+    ///</summary>
+    [SugarTable("tax_gongxianfang")]
+    public partial class TaxGongxianfang
+    {
+           public TaxGongxianfang(){
+
+
+           }
+           /// <summary>
+           /// Desc:主键
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(IsPrimaryKey=true)]
+           public string Id {get;set;}
+
+           /// <summary>
+           /// Desc:建筑物编码
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string zzwbm {get;set;}
+
+           /// <summary>
+           /// Desc:统计年度
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string tjnd {get;set;}
+
+           /// <summary>
+           /// Desc:年度贡献
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? ndgx {get;set;}
+
+           /// <summary>
+           /// Desc:备注
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string bz {get;set;}
+
+    }
+}

OpenAuth.Repository/SugarDbContext.cs

@@ -42,6 +42,8 @@ namespace OpenAuth.Repository
         public SugarRepositiry<TaxZongdi> TaxZongdi { get; set; }
         public SugarRepositiry<TaxYongdixian> TaxYongdixian { get; set; }
         public SugarRepositiry<TaxYongdidian> TaxYongdidian { get; set; }
+        public SugarRepositiry<TaxGongxiandi> TaxGongxiandi { get; set; }
+        public SugarRepositiry<TaxGongxianfang> TaxGongxianfang { get; set; }
 
     }
 }

OpenAuth.WebApi/Controllers/ServiceController/TaxCompanyController.cs

@@ -6,6 +6,9 @@ using Infrastructure;
 using OpenAuth.Repository.Domain;
 using OpenAuth.App.ServiceApp.CompanyManage.Request;
 using Microsoft.AspNetCore.Authorization;
+using Infrastructure.Helpers.Excel.Model;
+using Infrastructure.Helpers.Excel;
+using OpenAuth.App.ServiceApp.TaxZongdiManage.Request;
 
 namespace OpenAuth.WebApi.Controllers.ServiceController
 {
@@ -233,5 +236,50 @@ namespace OpenAuth.WebApi.Controllers.ServiceController
             return response;
         }
         #endregion
+        #region 获取导出数据
+        /// <summary>
+        /// 获取导出数据
+        /// </summary>
+        /// <param name="mid">功能id</param>
+        /// <param name="id">id数据</param>
+        /// <param name="query">查询参数</param>
+        /// <param name="code">编号</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<IActionResult> ExportCompany([FromQuery] TaxCompanyReq req)
+        {
+            var res = new Response();
+            //获取列表数据
+            var result = await _comApp.LoadCompanyPageExport(req);
+            List<ModuleColumn> columns = new List<ModuleColumn>
+            {
+                new ModuleColumn { key = "gid", value = "gid" },
+                new ModuleColumn { key = "RowNumber", value = "序号" },
+                new ModuleColumn { key = "shxydm", value = "社会信用代码" },
+                new ModuleColumn { key = "syrmc", value = "企业名称" },
+                new ModuleColumn { key = "hy", value = "行业" },
+                new ModuleColumn { key = "djqmc", value = "乡镇" },
+                new ModuleColumn { key = "djzqmc", value = "村" },
+                new ModuleColumn { key = "frdb", value = "法人代表" },
+                new ModuleColumn { key = "lxfs", value = "联系方式" },
+                new ModuleColumn { key = "xmgxcc", value = "企业产值" },
+                new ModuleColumn { key = "cscy", value = "测算财源" }
+            };
+            var excelRes = ExcelHelper.ListToExcel(result.Result, columns);
+            if (excelRes.Code == 200)
+            {
+                return File(excelRes.Result.ToArray(),
+                    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                    "企业信息" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls");
+            }
+            else
+            {
+                res.Code = excelRes.Code;
+                res.Message = "导出失败";
+            }
+            return Ok(res);
+        }
+        #endregion
     }
 }

OpenAuth.WebApi/Controllers/ServiceController/TaxGongxianController.cs

@@ -0,0 +1,311 @@
+using Infrastructure;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using OpenAuth.App.ServiceApp.TaxGongxianManage;
+using OpenAuth.Repository.Domain;
+
+namespace OpenAuth.WebApi.Controllers.ServiceController
+{
+    /// <summary>
+    /// 土地/房屋贡献
+    /// </summary>
+    [Route("api/[controller]/[action]")]
+    [ApiController]
+    public class TaxGongxianController : ControllerBase
+    {
+        TaxGongxianApp _comApp;
+        public TaxGongxianController(
+            TaxGongxianApp comApp)
+        {
+            _comApp = comApp;
+        }
+
+        #region 土地贡献
+        #region 获取分页数据列表
+        /// <summary>
+        /// 获取分页列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task<Response<PageInfo<List<TaxGongxiandi>>>> LoadGongxiandiPageList(string sszdbm, int page, int limit)
+        {
+            var result = new Response<PageInfo<List<TaxGongxiandi>>>();
+            try
+            {
+                var data = await _comApp.LoadGongxiandiPageList(sszdbm, page, limit);
+                result = data;
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 根据id获取单个土地贡献
+        /// </summary>
+        /// <param name="gid">企业土地贡献gid</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task<Response<TaxGongxiandi>> GetGongxiandiInfoById(string id)
+        {
+            var result = new Response<TaxGongxiandi>();
+            try
+            {
+                var data = await _comApp.GetGongxiandiInfoById(id);
+                result.Result = data;
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 根据所属宗地编码获取地线信息
+        /// </summary>
+        /// <param name="sszdbm">所属宗地编码</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task<Response<List<TaxGongxiandi>>> GetGongxiandiInfoByBM(string sszdbm)
+        {
+            var result = new Response<List<TaxGongxiandi>>();
+            try
+            {
+                var data = await _comApp.GetGongxiandiInfoByBM(sszdbm);
+                result.Result = data;
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return result;
+        }
+        #endregion
+        #region
+        /// <summary>
+        /// 添加土地贡献
+        /// </summary>
+        /// <param name="req"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<Response<bool>> AddGongxiandi(TaxGongxiandi req)
+        {
+            var result = new Response<bool>();
+            try
+            {
+                var data = await _comApp.AddGongxiandi(req);
+                result = data;
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 编辑土地贡献
+        /// </summary>
+        /// <param name="req"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<Response<bool>> UpdateGongxiandi(TaxGongxiandi req)
+        {
+            var result = new Response<bool>();
+            try
+            {
+                var data = await _comApp.UpdateGongxiandi(req);
+                result = data;
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 删除土地贡献
+        /// </summary>
+        /// <param name="ids">企业土地贡献gid</param>
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<Response<bool>> DeleteGongxiandi(string[] ids)
+        {
+            var result = new Response<bool>();
+            try
+            {
+                var data = await _comApp.DeleteGongxiandi(ids);
+                result = data;
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return result;
+        }
+        #endregion
+        #endregion
+
+        #region 房屋贡献
+        #region 获取分页数据列表
+        /// <summary>
+        /// 获取分页列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task<Response<PageInfo<List<TaxGongxianfang>>>> LoadGongxianfangPageList(string sszdbm, int page, int limit)
+        {
+            var result = new Response<PageInfo<List<TaxGongxianfang>>>();
+            try
+            {
+                var data = await _comApp.LoadGongxianfangPageList(sszdbm, page, limit);
+                result = data;
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 根据id获取单个房屋贡献
+        /// </summary>
+        /// <param name="gid">企业房屋贡献gid</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task<Response<TaxGongxianfang>> GetGongxianfangInfoById(string id)
+        {
+            var result = new Response<TaxGongxianfang>();
+            try
+            {
+                var data = await _comApp.GetGongxianfangInfoById(id);
+                result.Result = data;
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 根据所属宗地编码获取地点信息
+        /// </summary>
+        /// <param name="sszdbm">所属宗地编码</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task<Response<List<TaxGongxianfang>>> GetGongxianfangInfoByBM(string sszdbm)
+        {
+            var result = new Response<List<TaxGongxianfang>>();
+            try
+            {
+                var data = await _comApp.GetGongxianfangInfoByBM(sszdbm);
+                result.Result = data;
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return result;
+        }
+        #endregion
+        #region
+        /// <summary>
+        /// 添加房屋贡献
+        /// </summary>
+        /// <param name="req"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<Response<bool>> AddGongxianfang(TaxGongxianfang req)
+        {
+            var result = new Response<bool>();
+            try
+            {
+                var data = await _comApp.AddGongxianfang(req);
+                result = data;
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 编辑房屋贡献
+        /// </summary>
+        /// <param name="req"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<Response<bool>> UpdateGongxianfang(TaxGongxianfang req)
+        {
+            var result = new Response<bool>();
+            try
+            {
+                var data = await _comApp.UpdateGongxianfang(req);
+                result = data;
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 删除房屋贡献
+        /// </summary>
+        /// <param name="ids">企业房屋贡献gid</param>
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<Response<bool>> DeleteGongxianfang(string[] ids)
+        {
+            var result = new Response<bool>();
+            try
+            {
+                var data = await _comApp.DeleteGongxianfang(ids);
+                result = data;
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return result;
+        }
+        #endregion
+        #endregion
+    }
+}

OpenAuth.WebApi/Controllers/ServiceController/TaxManagementController.cs

@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using OpenAuth.App;
 using OpenAuth.App.ServiceApp.TaxManage;
+using OpenAuth.App.ServiceApp.TaxManage.Response;
 using OpenAuth.Repository.Domain;
 
 namespace OpenAuth.WebApi.Controllers
@@ -89,5 +90,50 @@ namespace OpenAuth.WebApi.Controllers
             return result;
         }
         #endregion
+
+        #region 地图图表数据
+        /// <summary>
+        /// 获取地图统计数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task<Response<dynamic>> LoadMapTotalData()
+        {
+            var result = new Response<dynamic>();
+            try
+            {
+                var data = await _taxApp.LoadMapTotalData();
+                result = data;
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return result;
+        }
+        /// <summary>
+        /// 获取图表数据（房产面积，土地面积）
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task<Response<List<TaxResponse>>> LoadChartData()
+        {
+            var result = new Response<List<TaxResponse>>();
+            try
+            {
+                var data = await _taxApp.LoadChartData();
+                result = data;
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return result;
+        }
+        #endregion
     }
 }