Browse Source

[合同管理][修改][添加字段]

release_toaliyun_real
gongbiao 7 years ago
parent
commit
d450400f8f
2 changed files with 31 additions and 4 deletions
  1. +23
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  2. +8
    -3
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 23
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java View File

@@ -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")


+ 8
- 3
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml View File

@@ -23,10 +23,13 @@
<result column="shop_id" jdbcType="INTEGER" property="shopId"/>
<result column="updatetime" jdbcType="TIMESTAMP" property="updatetime"/>
<result column="createtime" jdbcType="TIMESTAMP" property="createtime"/>
<result column="link_person" jdbcType="VARCHAR" property="linkPerson"/>
<result column="link_phone" jdbcType="VARCHAR" property="linkPhone"/>
</resultMap>
<sql id="allColumns">
`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`
</sql>
<sql id="dynamicWhereConditions">
@@ -52,6 +55,8 @@
<if test=" null != shopId ">and `shop_id` = #{shopId}</if>
<if test=" null != updatetime ">and `updatetime` = #{updatetime}</if>
<if test=" null != createtime ">and `createtime` = #{createtime}</if>
<if test=" null != linkPerson ">and `link_person` = #{linkPerson}</if>
<if test=" null != linkPhone ">and `link_phone` = #{linkPhone}</if>
<if test=" null != ids ">
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
<where>
<if test=" null != merchantName">and rc.`merchant_name` like concat('%',#{merchantName},'%') </if>
<if test=" null != merchantName">and rc.`merchant_name` like concat('%',#{merchantName},'%')</if>
<if test=" null != shopNumber ">and s.`shop_number` like concat('%',#{shopNumber},'%')</if>
<if test=" null != status ">and rc.`status` = #{status}</if>
</where>
@@ -111,5 +116,5 @@
<update id="updateRentContractEndStatus" parameterType="com.iformall.domain.po.WxRentContract">
update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=#{status} and status!=1 and rental_end_date &lt;now()
</update>
</mapper>

Loading…
Cancel
Save