From bce6914e12a378e47446c88c4aa2a8f22602bad7 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Wed, 29 Jun 2022 17:56:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E5=AE=9E=E4=BF=A1=E6=81=AF=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5-=E8=A1=A8=E5=BF=85=E5=A1=AB=E9=A1=B9=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/IcNeighborHoodDao.java |  2 +-
 .../impl/IcOrganizationCodeInfoServiceImpl.java        | 10 +++++-----
 .../V0.0.32__alter_ic_organization_code_info.sql       |  7 ++++++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
index f872338c1e..a1999a0ee6 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
@@ -210,5 +210,5 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
      * @Author zhaoqifeng
      * @Date 2022/6/29 16:48
      */
-    List<HomeListResultDTO> getHouseList(HouseInformationFormDTO formDTO)
+    List<HomeListResultDTO> getHouseList(HouseInformationFormDTO formDTO);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcOrganizationCodeInfoServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcOrganizationCodeInfoServiceImpl.java
index 3466b89a3b..a992a25e31 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcOrganizationCodeInfoServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcOrganizationCodeInfoServiceImpl.java
@@ -229,10 +229,10 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
         //查询该社区下是否存在单元数据
         IcOrganizationCodeInfoEntity unitEntity = baseDao.selectByCommunityIdAndCustomerId(customerId, communResult.getCommunityId());
         if (StringUtils.isBlank(unitEntity.getUnitMaxNum())) {
-            result.setCoding(communResult.getCoding() + "001");
-            result.setSysCoding(communResult.getSysCoding() + "001");
+            result.setCoding(communResult.getCoding() + "01");
+            result.setSysCoding(communResult.getSysCoding() + "01");
             //补充该社区的单元最大数
-            unitEntity.setUnitMaxNum("001");
+            unitEntity.setUnitMaxNum("01");
         } else {
             Integer unitMaxNum = Integer.valueOf(unitEntity.getUnitMaxNum()) + 1;
             //验证可编辑的编码是否有重复
@@ -282,7 +282,7 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
         if (StringUtils.isBlank(houseEntity.getUnitMaxNum())) {
             result.setCoding(communResult.getCoding() + "001");
             //补充该社区的单元最大数
-            houseEntity.setUnitMaxNum("001");
+            houseEntity.setHouseMaxNum("001");
         } else {
             Integer houseMaxNum = Integer.valueOf(houseEntity.getUnitMaxNum()) + 1;
             //验证可编辑的编码是否有重复
@@ -296,7 +296,7 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
             result.setCoding(houseCode);
 
             //更新该社区下最大的房屋编号
-            houseEntity.setUnitMaxNum(getNewMaxIndex(4, houseMaxNum));
+            houseEntity.setHouseMaxNum(getNewMaxIndex(4, houseMaxNum));
         }
         baseDao.updateHouseByCuIdAndCoId(houseEntity);
         return new Result<OrganizationCodeResultDTO>().ok(result);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.32__alter_ic_organization_code_info.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.32__alter_ic_organization_code_info.sql
index aa87d01a3a..ee6e1fc7a1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.32__alter_ic_organization_code_info.sql
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.32__alter_ic_organization_code_info.sql
@@ -1,4 +1,9 @@
-alter table ic_organization_code_info add COLUMN`UNIT_MAX_NUM` varchar(10) NOT NULL COMMENT '该社区下最大的单元编码序列号';
+alter table ic_organization_code_info add COLUMN `UNIT_MAX_NUM` varchar(10) NOT NULL COMMENT '该社区下最大的单元编码序列号';
 
 alter table ic_building_unit add COLUMN  `CODING` varchar(64) DEFAULT NULL COMMENT '单元编码';
 alter table ic_building_unit add COLUMN  `SYS_CODING` varchar(64) DEFAULT NULL COMMENT '单元系统编码';
+
+ALTER TABLE ic_organization_code_info MODIFY  COLUMN `NEIGHBOR_MAX_NUM` varchar(10) DEFAULT NULL COMMENT '该社区下最大的小区编码序列号';
+ALTER TABLE ic_organization_code_info MODIFY  COLUMN `BUILDING_MAX_NUM` varchar(10) DEFAULT NULL COMMENT '该社区下最大的楼栋编码序列号';
+ALTER TABLE ic_organization_code_info MODIFY  COLUMN `UNIT_MAX_NUM` varchar(10) DEFAULT NULL COMMENT '该社区下最大的单元编码序列号';
+ALTER TABLE ic_organization_code_info MODIFY  COLUMN `HOUSE_MAX_NUM` varchar(10) DEFAULT NULL COMMENT '该社区下最大的房屋编码序列号';