diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java
index f25311b2db..2e0484f6b7 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java
@@ -141,4 +141,9 @@ public class IcHouseDTO implements Serializable {
*/
private Date updatedTime;
+ /**
+ * 备注
+ */
+ private String remark;
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java
index 440b2323bb..8882060a2e 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java
@@ -101,6 +101,11 @@ public class IcHouseAddFormDTO implements Serializable {
*/
private String ownerIdCard;
+ /**
+ * 备注
+ */
+ private String remark;
+
private BigDecimal sort = NumConstant.ZERO_DECIMAL;
}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
index b57f0bdadc..cec2d19994 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
@@ -70,4 +70,13 @@ public class IcHouseListFormDTO extends PageFormDTO {
*/
private String sortType;
+ /**
+ * 房屋用途
+ */
+ private String purpose;
+
+ /**
+ * 备注
+ */
+ private String remark;
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java
index 362740e9c2..9383210f9c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java
@@ -107,4 +107,9 @@ public class IcHouseEntity extends BaseEpmetEntity {
*/
private BigDecimal sort;
+ /**
+ * 备注
+ */
+ private String remark;
+
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.20__alter_ic_house.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.20__alter_ic_house.sql
new file mode 100644
index 0000000000..5c2deb613e
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.20__alter_ic_house.sql
@@ -0,0 +1 @@
+ALTER TABLE epmet_gov_org.ic_house ADD REMARK varchar(255) NULL COMMENT '备注';
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index 53d4ff2277..5fe411e6ee 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -164,6 +164,12 @@
AND a.rent_flag = #{rentFlag}
+
+ AND a.PURPOSE = #{purpose}
+
+
+ AND a.REMARK like CONCAT('%',#{remark},'%')
+
and a.del_flag = '0'
#排序规则:根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序