Merge remote-tracking branch 'origin/developer_bw' into developer_bw

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HouseholdContractPageDto.java

@@ -48,4 +48,6 @@ public class HouseholdContractPageDto extends Page<HouseholdContract> {
     private String userId;
     private String contractNumber;
     private String regionalCompaniesName;
+    //省份
+    private String province;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HouseholdContractMapper.xml

@@ -45,6 +45,9 @@
             <if test="dto.regionalCompaniesName != null and dto.regionalCompaniesName !=''">
                 and hygf_household_contract.regional_companies_name like concat('%',#{dto.regionalCompaniesName},'%')
             </if>
+            <if test="dto.province != null and dto.province !=''">
+                and php.project_address like concat ('%',#{dto.province},'%')
+            </if>
         </where>
         <if test="dto.orderBy  == null ">
             ORDER BY hygf_household_contract.rec_date DESC