Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master

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;
+
 }

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;
 
 }

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;
 }

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;
+
 }

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 '备注';

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -164,6 +164,12 @@
             <if test="rentFlag != null and rentFlag.trim() != ''">
                 AND a.rent_flag = #{rentFlag}
             </if>
+            <if test="purpose != null and purpose.trim() != ''">
+                AND a.PURPOSE = #{purpose}
+            </if>
+            <if test="remark != null and remark.trim() != ''">
+                AND a.REMARK like CONCAT('%',#{remark},'%')
+            </if>
            and a.del_flag = '0'
         </where>
        #排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序