From dd257e49ae069b4412c53c00472644cde64fb29a Mon Sep 17 00:00:00 2001
From: ky_yusj <2655568377@qq.com>
Date: Thu, 20 May 2021 15:25:47 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=8E=B7=E5=8F=96=E5=90=8C=E4=B8=80?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E4=B8=8B=E7=9A=84=E4=B8=8B=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/HouseCode/HouseCodeService.cs     | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/Api/Ewide.Application/Service/HouseCode/HouseCodeService.cs b/Api/Ewide.Application/Service/HouseCode/HouseCodeService.cs
index f468ddf..5534b39 100644
--- a/Api/Ewide.Application/Service/HouseCode/HouseCodeService.cs
+++ b/Api/Ewide.Application/Service/HouseCode/HouseCodeService.cs
@@ -12,9 +12,15 @@ using Microsoft.EntityFrameworkCore;
 using System.Threading.Tasks;
 using Dapper;
 using Ewide.Core.Extension;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
 
 namespace Ewide.Application.Service.HouseCode
 {
+    /// <summary>
+    /// 房屋编码相关
+    /// </summary>
+    [ApiDescriptionSettings(Name = "HouseCode", Order = 180)]
     public class HouseCodeService : IHouseCodeService, IDynamicApiController, ITransient
     {
         private readonly IRepository<BsHouseCode> _houseCodeRep;
@@ -30,7 +36,7 @@ namespace Ewide.Application.Service.HouseCode
         public async Task AddHouseCode(AddHouseCodeInput input)
         {
             var areaCodeRep = Db.GetRepository<SysAreaCode>();
-            var areaCode = await areaCodeRep.DetachedEntities.FirstOrDefaultAsync(a => a.Code == input.AreaCode);
+            var areaCode = await areaCodeRep.DetachedEntities.FirstOrDefaultAsync(a => a.Code == input.AreaCode && a.LevelType == 4);
             if(areaCode == null) throw Oops.Oh("区域编码有误，添加失败");
             input.HouseCode = areaCode.AdCode + input.No.ToString().PadLeft(3, '0');
             var houseCode = input.Adapt<BsHouseCode>();
@@ -63,5 +69,23 @@ LEFT JOIN sys_area_code RA ON RA.AdCode = SUBSTR(CA.AdCode,1,9)
 LEFT JOIN sys_area_code AA ON AA.AdCode = SUBSTR(CA.AdCode,1,6) WHERE HC.Address like @Address";
             return await _dapperRepository.QueryPageData(sql, input, param: new { Address = '%' + input.Address + '%' });
         }
+
+        /// <summary>
+        /// 获取同一区域下的下一个编号
+        /// </summary>
+        /// <param name="areaCode"></param>
+        /// <returns></returns>
+        [HttpGet("/houseCode/GetNextNoByFullNumber")]
+        public async Task<dynamic> GetNextNoByFullNumber([Required] string areaCode)
+        {
+            var areaCodeRep = Db.GetRepository<SysAreaCode>();
+            //取到社区编码
+            var commAreaCode = await areaCodeRep.FirstOrDefaultAsync(a => a.Code == areaCode && a.LevelType == 4);
+            if(commAreaCode == null) throw Oops.Oh("区域编码有误，房屋编码生成失败");
+            var maxNo = await _houseCodeRep.DetachedEntities
+                .Where(h => h.HouseCode.Contains(commAreaCode.AdCode))
+                .MaxAsync(h => (int?)h.No);
+            return maxNo.GetValueOrDefault(0) + 1;
+        }
     }
 }