Просмотр исходного кода

[租赁合同][修改][添加主体名称]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
6dbfe07e77
3 измененных файлов: 9 добавлений и 2 удалений
  1. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V201905291742___RENT_CONTRACT.sql
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  3. +4
    -2
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V201905291742___RENT_CONTRACT.sql Просмотреть файл

@@ -0,0 +1,2 @@
ALTER TABLE `wx_rent_contract`
ADD COLUMN `subject_name` varchar(200) DEFAULT NULL COMMENT '主体名称';

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java Просмотреть файл

@@ -214,6 +214,9 @@ public class WxRentContract extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "多径租赁单价(其他放rentInfo)", name = "priceUnit")
private String rentPrice;

@io.swagger.annotations.ApiModelProperty(value = "主体名称", name = "subjectName")
private String subjectName;

public static enum Field {
Id_ASC("`id` ASC"), Id_DESC("`id` DESC")
, MerchantId_ASC("`merchant_id` ASC"), MerchantId_DESC("`merchant_id` DESC")


+ 4
- 2
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Просмотреть файл

@@ -46,6 +46,7 @@
<result column="file_names" jdbcType="VARCHAR" property="fileNames"/>
<result column="price_unit" property="priceUnit"/>
<result column="rent_price" property="rentPrice"/>
<result column="subject_name" property="subjectName"/>

</resultMap>
@@ -56,7 +57,7 @@
`pay_account`,`filename`,`lease`,`type`,`revenue`,`adjust_ratio`,`adjust_period`,`pay_ratio`,
`start_date`,`end_date`,
`apply_status`,`bank_name`,`rent_shop_type`,`fix_start_date`,`fix_end_date`,
`business_type`,`rent_info`, `file_names`,price_unit,rent_price
`business_type`,`rent_info`, `file_names`,price_unit,rent_price,`subject_name`
</sql>
@@ -115,7 +116,8 @@
rc.lease,rc.filepath,rc.filename,rc.pay_account payAccount,rc.sign_date signDate,rc.merchant_id merchantId,rc.type,
rc.start_date startDate,rc.end_date endDate,br.`name` brandName,rc.apply_status applyStatus,rc.bank_name
bankName,rc.rent_shop_type rentShopType,rc.fix_start_date fixStartDate,rc.fix_end_date fixEndDate
,rc.business_type businessType,rc.adjust_period adjustPeriod,rc.rent_info rentInfo, rc.file_names fileNames,rc.price_unit
,rc.business_type businessType,rc.adjust_period adjustPeriod,rc.rent_info rentInfo, rc.file_names
fileNames,rc.price_unit,rc.subject_name subjectName
from wx_rent_contract rc
left join wx_shop s on rc.shop_id=s.id
left join wx_mall_floor f on s.floor=f.id


Загрузка…
Отмена
Сохранить