Merge branch 'feature/lc_screenCompanyModify' into feature/lc_personExport

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ScreenCompanyDTO.java

@@ -81,6 +81,11 @@ public class ScreenCompanyDTO implements Serializable {
      */
 	private Integer employedPopulation;
 
+	/**
+	 * 房屋类型company-企业，shops-商铺，villageLiving-村居
+	 */
+	private String houseType;
+
     /**
      * 经度
      */

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcScreenCompanyListFormDTO.java

@@ -26,4 +26,9 @@ public class EpdcScreenCompanyListFormDTO implements Serializable {
      * 企业名称
      */
     private String companyName;
+
+    /**
+     * 房屋类型
+     */
+    private String houseType;
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcScreenCompanyListResultDTO.java

@@ -40,6 +40,11 @@ public class EpdcScreenCompanyListResultDTO implements Serializable {
      */
     private String companyAddress;
 
+    /**
+     * 房屋类型
+     */
+    private String houseType;
+
     /**
      * 经度
      */

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/ScreenCompanyEntity.java

@@ -78,6 +78,11 @@ public class ScreenCompanyEntity extends BaseEpdcEntity {
      */
 	private Integer employedPopulation;
 
+	/**
+	 * 房屋类型company-企业，shops-商铺，villageLiving-村居
+	 */
+	private String houseType;
+
     /**
      * 经度
      */

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/ScreenCompanyServiceImpl.java

@@ -73,10 +73,10 @@ public class ScreenCompanyServiceImpl extends BaseServiceImpl<ScreenCompanyDao,
 
     private QueryWrapper<ScreenCompanyEntity> getWrapper(Map<String, Object> params){
         String companyName = (String)params.get("companyName");
-
+        String houseType = (String)params.get("houseType");
         QueryWrapper<ScreenCompanyEntity> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(companyName), "COMPANY_NAME", companyName.trim());
-
+        wrapper.like(StringUtils.isNotBlank(houseType),"HOUSE_TYPE",houseType.trim());
         return wrapper;
     }
 

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/epidemic/ScreenCompanyDao.xml

@@ -13,6 +13,7 @@
         <result property="uniformSocialCreditCode" column="UNIFORM_SOCIAL_CREDIT_CODE"/>
         <result property="registeredCapital" column="REGISTERED_CAPITAL"/>
         <result property="employedPopulation" column="EMPLOYED_POPULATION"/>
+        <result property="houseType" column="HOUSE_TYPE"/>
         <result property="longitude" column="LONGITUDE"/>
         <result property="latitude" column="LATITUDE"/>
         <collection property="images" ofType="com.elink.esua.epdc.dto.result.ScreenCompanyImagesResultDTO">
@@ -31,6 +32,7 @@
             c.UNIFORM_SOCIAL_CREDIT_CODE,
             c.REGISTERED_CAPITAL,
             c.EMPLOYED_POPULATION,
+            c.HOUSE_TYPE,
             c.LONGITUDE,
             c.LATITUDE,
             i.IMG_URL,
@@ -49,6 +51,7 @@
         <result property="companyIntroduction" column="COMPANY_INTRODUCTION"/>
         <result property="contactPerson" column="CONTACT_PERSON"/>
         <result property="mobile" column="MOBILE"/>
+        <result property="houseType" column="HOUSE_TYPE"/>
         <result property="companyAddress" column="COMPANY_ADDRESS"/>
         <result property="longitude" column="LONGITUDE"/>
         <result property="latitude" column="LATITUDE"/>
@@ -64,6 +67,7 @@
             c.CONTACT_PERSON,
             c.MOBILE,
             c.COMPANY_ADDRESS,
+            c.HOUSE_TYPE,
             c.LONGITUDE,
             c.LATITUDE,
             i.IMG_URL
@@ -75,6 +79,9 @@
         <if test="companyName != null and companyName != ''">
             and c.COMPANY_NAME like concat('%', #{companyName}, '%')
         </if>
+        <if test="houseType != null and houseType != ''">
+            and c.HOUSE_TYPE = #{houseType}
+        </if>
         ORDER BY c.CREATED_TIME DESC
         LIMIT #{pageIndex},#{pageSize}
     </select>