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

[合同优化][添加][完善合同优化需求]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
ec5c870d29
6 измененных файлов: 4 добавлений и 131 удалений
  1. +0
    -19
      mallinkAdmin/src/main/resources/db/migration/V201905161420__L_ALTER_BILL.sql
  2. +0
    -8
      mallinkAdmin/src/main/resources/db/migration/V201905171432__L_ALTER_BILL.sql
  3. +0
    -44
      mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
  4. +0
    -44
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  5. +2
    -8
      mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml
  6. +2
    -8
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

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

@@ -1,19 +0,0 @@
ALTER TABLE wx_rent_contract
ADD COLUMN total_period_month int(11) DEFAULT 0 COMMENT '总租期(月)';

ALTER TABLE wx_rent_contract
ADD COLUMN total_period_day int(11) DEFAULT 0 COMMENT '总租期(天)';

ALTER TABLE wx_property_contract
ADD COLUMN total_period_month int(11) DEFAULT 0 COMMENT '总租期(月)';

ALTER TABLE wx_property_contract
ADD COLUMN total_period_day int(11) DEFAULT 0 COMMENT '总租期(天)';



ALTER TABLE wx_rent_contract
ADD COLUMN rent_price BIGINT(12) DEFAULT 0 COMMENT '租赁单价';

ALTER TABLE wx_property_contract
ADD COLUMN rent_price BIGINT(12) DEFAULT 0 COMMENT '租赁单价';

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

@@ -1,8 +0,0 @@



ALTER TABLE wx_rent_contract
ADD COLUMN price_unit INT(1) DEFAULT 1 COMMENT '租金单位1日2月3年';

ALTER TABLE wx_property_contract
ADD COLUMN price_unit INT(1) DEFAULT 1 COMMENT '租金单位1日2月3年';

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

@@ -183,19 +183,6 @@ public class WxPropertyContract extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "fileNames")
private String fileNames;

@io.swagger.annotations.ApiModelProperty(value = "总租期(月)", name = "totalPeriodMonth")
private Integer totalPeriodMonth;

@io.swagger.annotations.ApiModelProperty(value = "总租期(天)", name = "totalPeriodDay")
private Integer totalPeriodDay;

@io.swagger.annotations.ApiModelProperty(value = "租赁单价", name = "rentPrice")
private Integer rentPrice;

@io.swagger.annotations.ApiModelProperty(value = "租金单位1日2月3年", name = "priceUnit")
private Integer priceUnit;


@Transient
private String building;

@@ -218,37 +205,6 @@ public class WxPropertyContract extends BaseEntity {
this.floor = floor;
}

public Integer getPriceUnit() {
return priceUnit;
}

public void setPriceUnit(Integer priceUnit) {
this.priceUnit = priceUnit;
}
public Integer getTotalPeriodMonth() {
return totalPeriodMonth;
}

public void setTotalPeriodMonth(Integer totalPeriodMonth) {
this.totalPeriodMonth = totalPeriodMonth;
}

public Integer getTotalPeriodDay() {
return totalPeriodDay;
}

public void setTotalPeriodDay(Integer totalPeriodDay) {
this.totalPeriodDay = totalPeriodDay;
}

public Integer getRentPrice() {
return rentPrice;
}

public void setRentPrice(Integer rentPrice) {
this.rentPrice = rentPrice;
}

public String getFileNames() {
return fileNames;
}


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

@@ -331,50 +331,6 @@ public class WxRentContract extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "fileNames")
private String fileNames;

@io.swagger.annotations.ApiModelProperty(value = "总租期(月)", name = "totalPeriodMonth")
private Integer totalPeriodMonth;

@io.swagger.annotations.ApiModelProperty(value = "总租期(天)", name = "totalPeriodDay")
private Integer totalPeriodDay;

@io.swagger.annotations.ApiModelProperty(value = "租赁单价", name = "rentPrice")
private Integer rentPrice;

@io.swagger.annotations.ApiModelProperty(value = "租金单位1日2月3年", name = "priceUnit")
private Integer priceUnit;

public Integer getPriceUnit() {
return priceUnit;
}

public void setPriceUnit(Integer priceUnit) {
this.priceUnit = priceUnit;
}

public Integer getTotalPeriodMonth() {
return totalPeriodMonth;
}

public void setTotalPeriodMonth(Integer totalPeriodMonth) {
this.totalPeriodMonth = totalPeriodMonth;
}

public Integer getTotalPeriodDay() {
return totalPeriodDay;
}

public void setTotalPeriodDay(Integer totalPeriodDay) {
this.totalPeriodDay = totalPeriodDay;
}

public Integer getRentPrice() {
return rentPrice;
}

public void setRentPrice(Integer rentPrice) {
this.rentPrice = rentPrice;
}

public String getRentInfo() {
return rentInfo;
}


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

@@ -38,10 +38,6 @@
<result column="adjust_ratio" property="adjustRatio"/>
<result column="rent_info" jdbcType="VARCHAR" property="rentInfo"/>
<result column="file_names" jdbcType="VARCHAR" property="fileNames"/>
<result column="total_period_month" property="totalPeriodMonth"/>
<result column="total_period_day" property="totalPeriodDay"/>
<result column="rent_price" property="rentPrice"/>
<result column="price_unit" property="priceUnit"/>
</resultMap>
<sql id="allColumns">
@@ -50,8 +46,7 @@
`deposit`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`,
`shop_type`,`shop_id`,`updatetime`,`createtime`,`rent_area`,
`link_person`,`link_phone`,`pay_account`,`filename`,`lease`,`rent_contract_id`,
`start_date`,`end_date`,`apply_status`,`adjust_period`,`business_type`,adjust_ratio,`rent_info`, `file_names`,
total_period_month,total_period_day,rent_price,price_unit
`start_date`,`end_date`,`apply_status`,`adjust_period`,`business_type`,adjust_ratio,`rent_info`, `file_names`
</sql>
<sql id="dynamicWhereConditions">
@@ -111,8 +106,7 @@
rc.lease,rc.filepath,rc.filename,rc.pay_account payAccount,rc.sign_date signDate,
start_date startDate,end_date endDate,rc.rent_contract_id rentContractId,br.`name` brandName,
s.addr,rc.apply_status applyStatus,rc.adjust_period adjustPeriod,rc.business_type businessType,
rc.adjust_ratio adjustRatio,rc.rent_info rentInfo, rc.file_names fileNames,
rc.total_period_month,rc.total_period_day,rc.rent_price
rc.adjust_ratio adjustRatio,rc.rent_info rentInfo, rc.file_names fileNames
from wx_property_contract rc
left join wx_shop s on rc.shop_id=s.id
left join wx_mall_floor f on s.floor=f.id


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

@@ -44,11 +44,6 @@
<result column="receive_period" property="receivePeriod"/>
<result column="rent_info" jdbcType="VARCHAR" property="rentInfo"/>
<result column="file_names" jdbcType="VARCHAR" property="fileNames"/>
<result column="total_period_month" property="totalPeriodMonth"/>
<result column="total_period_day" property="totalPeriodDay"/>
<result column="rent_price" property="rentPrice"/>
<result column="price_unit" property="priceUnit"/>

</resultMap>
<sql id="allColumns">
@@ -58,7 +53,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`,total_period_month,total_period_day,rent_price,price_unit
`business_type`,`rent_info`, `file_names`

</sql>
@@ -118,8 +113,7 @@
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.total_period_month,rc.total_period_day,rc.rent_price
,rc.business_type businessType,rc.adjust_period adjustPeriod,rc.rent_info rentInfo, rc.file_names fileNames
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


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