diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 0e4cd180e..53bf9bd6a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -113,9 +113,15 @@ public class WxRentContract implements Serializable { @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; - @io.swagger.annotations.ApiModelProperty(value="计租面积",name="rent_area") + @io.swagger.annotations.ApiModelProperty(value="计租面积",name="rentArea") private String rent_area; + @io.swagger.annotations.ApiModelProperty(value="联系人",name="linkPerson") + private String linkPerson; + + @io.swagger.annotations.ApiModelProperty(value="联系电话",name="linkPhone") + private String linkPhone; + public Integer getMerchantId() { return merchantId; } @@ -247,6 +253,22 @@ public class WxRentContract implements Serializable { this.rent_area = rent_area; } + public String getLinkPerson() { + return linkPerson; + } + + public void setLinkPerson(String linkPerson) { + this.linkPerson = linkPerson; + } + + public String getLinkPhone() { + return linkPhone; + } + + public void setLinkPhone(String linkPhone) { + this.linkPhone = linkPhone; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 006bb13fe..da22b8715 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -23,10 +23,13 @@ + + + - `id`,`merchant_id`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`,`tenant_id`,`filepath`,`status`,`contract_number`,`deposit`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`,`shop_type`,`shop_id`,`updatetime`,`createtime` + `id`,`merchant_id`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`,`tenant_id`,`filepath`,`status`,`contract_number`,`deposit`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`,`shop_type`,`shop_id`,`updatetime`,`createtime`,`link_person`,`link_phone` @@ -52,6 +55,8 @@ and `shop_id` = #{shopId} and `updatetime` = #{updatetime} and `createtime` = #{createtime} + and `link_person` = #{linkPerson} + and `link_phone` = #{linkPhone} and id in @@ -77,7 +82,7 @@ left join wx_mall_floor f on s.floor=f.id left join wx_mall_building b on s.building=b.id - and rc.`merchant_name` like concat('%',#{merchantName},'%') + and rc.`merchant_name` like concat('%',#{merchantName},'%') and s.`shop_number` like concat('%',#{shopNumber},'%') and rc.`status` = #{status} @@ -111,5 +116,5 @@ update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=#{status} and status!=1 and rental_end_date <now() - +