diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java index 9b78c87c6..70f1d400c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java @@ -1,6 +1,5 @@ package com.iformall.domain.vo; -import com.iformall.common.SortColumn; import com.iformall.domain.po.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -8,8 +7,6 @@ import lombok.ToString; import javax.persistence.Id; import javax.persistence.Transient; -import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -33,232 +30,19 @@ public class WxRentPropertyContractVo extends BaseEntity { return super.getSortColumns(); } - @Transient - @SortColumn(column = "shopNumber") - private String shopNumber; - - @Transient - private String building; - - @Transient - private String floor; - - @Transient - private String brandName; - - @Transient - private String buildArea; - - @Transient - private String priceStr; - - @Transient - private String depositStr; - - @Transient - @SortColumn(column = "allPeriod") - private Integer allPeriod; - - @Transient - @SortColumn(column = "period") - private Integer period; - - @Transient - @SortColumn(column = "needPay") - private Integer needPay; - - @Transient - @SortColumn(column = "receivePay") - private Integer receivePay; - - @Transient - @SortColumn(column = "owe") - private Integer owe; - - @Transient - @SortColumn(column = "receiveDate") - private String receiveDate; - - @Transient - @SortColumn(column = "latePayPrice") - private Integer latePayPrice; - - @io.swagger.annotations.ApiModelProperty(value = "商户", name = "merchantId") - private Long merchantId; - @io.swagger.annotations.ApiModelProperty(value = "月租金/分成(分)", name = "price") - private Long price; - @io.swagger.annotations.ApiModelProperty(value = "计租开始时间", name = "rentalStartDate") - private Date rentalStartDate; - @io.swagger.annotations.ApiModelProperty(value = "计租结束时间", name = "rentalEndDate") - private Date rentalEndDate; - @io.swagger.annotations.ApiModelProperty(value = "签定合同时间", name = "signDate") - private Date signDate; - @io.swagger.annotations.ApiModelProperty(value = "付款周期", name = "receivePeriod") - private Integer receivePeriod; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "合同文件路径", name = "filepath") - private String filepath; - @io.swagger.annotations.ApiModelProperty(value = "合同进度状态1待签约2已签约未记租3计租中4提前终止5合同到期", name = "status") - private Integer status; @io.swagger.annotations.ApiModelProperty(value = "合同编号", name = "contractNumber") private String contractNumber; - @io.swagger.annotations.ApiModelProperty(value = "押金", name = "deposit") - private Long deposit; - - @io.swagger.annotations.ApiModelProperty(value = "交租日 计租开始时间减去交租日的天数为基数 提前多少日交租", name = "payDate") - @SortColumn(column = "payDate") - private Integer payDate; - @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") - private Integer isDel; - @io.swagger.annotations.ApiModelProperty(value = "商户名称", name = "merchantName") - private String merchantName; - @io.swagger.annotations.ApiModelProperty(value = "经营品牌", name = "brand") - private Long brand; - @io.swagger.annotations.ApiModelProperty(value = "经常业态ID", name = "businessId") - private Integer businessId; - @io.swagger.annotations.ApiModelProperty(value = "店铺类型", name = "shopType") - private Integer shopType; - @io.swagger.annotations.ApiModelProperty(value = "商铺ID", name = "shopId") - private Long shopId; - @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updatetime") - private Date updatetime; - - @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createtime") - private Date createtime; - - @io.swagger.annotations.ApiModelProperty(value = "计租面积", name = "rentArea") - private String rentArea; - @io.swagger.annotations.ApiModelProperty(value = "联系人", name = "linkPerson") - private String linkPerson; - - @io.swagger.annotations.ApiModelProperty(value = "联系电话", name = "linkPhone") - private String linkPhone; - - @io.swagger.annotations.ApiModelProperty(value = "付款账号", name = "payAccount") - private String payAccount; - - @io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "filename") - private String filename; - - @io.swagger.annotations.ApiModelProperty(value = "租期(月)", name = "lease") - private Integer lease; - - @io.swagger.annotations.ApiModelProperty(value = "类型", name = "type") - private Integer type; - - @io.swagger.annotations.ApiModelProperty(value = "调整比例", name = "adjustRatio") - private String adjustRatio; - - @io.swagger.annotations.ApiModelProperty(value = "计租周期 1日2月", name = "adjustPeriod") - private Integer adjustPeriod; - - @io.swagger.annotations.ApiModelProperty(value = "支付比例", name = "payRatio") - private Integer payRatio; - - @io.swagger.annotations.ApiModelProperty(value = "营业额", name = "revenue") - private Long revenue; - - @io.swagger.annotations.ApiModelProperty(value = "起租开始时间", name = "rentalStartDate") - private Date startDate; - - @io.swagger.annotations.ApiModelProperty(value = "起租结束时间", name = "rentalEndDate") - private Date endDate; - - @io.swagger.annotations.ApiModelProperty(value = "审核状态,0未审核 1审核中 2审核通过 3驳回", name = "applyStatus") - private Integer applyStatus; - - @io.swagger.annotations.ApiModelProperty(value = "开户行", name = "bankName") - private String bankName; - - @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") - private Integer rentShopType; - - @io.swagger.annotations.ApiModelProperty(value = "装修期开始时间", name = "fixStartDate") - private Date fixStartDate; - - @io.swagger.annotations.ApiModelProperty(value = "装修期结束时间", name = "fixEndDate") - private Date fixEndDate; + @io.swagger.annotations.ApiModelProperty(value = "商铺号", name = "shopNumber") + private String shopNumber; - @io.swagger.annotations.ApiModelProperty(value = "租金信息", name = "rentInfo") + @io.swagger.annotations.ApiModelProperty(value = "商铺信息", name = "rentInfo") private String rentInfo; - @io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "fileNames") - private String fileNames; - - @io.swagger.annotations.ApiModelProperty(value = "租金单位1日2月3年", name = "priceUnit") - private Integer priceUnit; - - @io.swagger.annotations.ApiModelProperty(value = "多径租赁单价(其他放rentInfo)", name = "priceUnit") - private String rentPrice; - - @io.swagger.annotations.ApiModelProperty(value = "主体名称", name = "subjectName") - private String subjectName; - - @io.swagger.annotations.ApiModelProperty(value = "1按租赁日生产2按计租日生成账单", name = "rentStartType") - private Integer rentStartType; - - @io.swagger.annotations.ApiModelProperty(value = "租金录入方式1合铺录入2分铺录入", name = "rent_input_way") - private Integer rentInputWay; - - @io.swagger.annotations.ApiModelProperty(value = "年租金调整方式1按比例2按金额", name = "adjust_ratio_way") - private Integer adjustRatioWay; - - public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), MerchantId_ASC("`merchant_id` ASC"), MerchantId_DESC("`merchant_id` DESC"), Price_ASC("`price` ASC"), Price_DESC("`price` DESC"), RentalStartDate_ASC("`rental_start_date` ASC"), RentalStartDate_DESC("`rental_start_date` DESC"), RentalEndDate_ASC("`rental_end_date` ASC"), RentalEndDate_DESC("`rental_end_date` DESC"), SignDate_ASC("`sign_date` ASC"), SignDate_DESC("`sign_date` DESC"), ReceivePeriod_ASC("`receive_period` ASC"), ReceivePeriod_DESC("`receive_period` DESC"), TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), Filepath_ASC("`filepath` ASC"), Filepath_DESC("`filepath` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), ContractNumber_ASC("`contract_number` ASC"), ContractNumber_DESC("`contract_number` DESC"), Deposit_ASC("`deposit` ASC"), Deposit_DESC("`deposit` DESC"), PayDate_ASC("`pay_date` ASC"), PayDate_DESC("`pay_date` DESC"), IsDel_ASC("`is_del` ASC"), IsDel_DESC("`is_del` DESC"), MerchantName_ASC("`merchant_name` ASC"), MerchantName_DESC("`merchant_name` DESC"), Brand_ASC("`brand` ASC"), Brand_DESC("`brand` DESC"), BusinessId_ASC("`business_id` ASC"), BusinessId_DESC("`business_id` DESC"), ShopType_ASC("`shop_type` ASC"), ShopType_DESC("`shop_type` DESC"), ShopId_ASC("`shop_id` ASC"), ShopId_DESC("`shop_id` DESC"), Updatetime_ASC("`updatetime` ASC"), Updatetime_DESC("`updatetime` DESC"), Createtime_ASC("`createtime` ASC"), Createtime_DESC("`createtime` DESC"); - private String value; - - Field(String value) { - this.value = value; - } - - public String getValue() { - return value; - } - - public void setCol(String value) { - this.value = value; - } - - @Override - public String toString() { - return this.getValue(); - } - } + @io.swagger.annotations.ApiModelProperty(value = "商户名称", name = "merchantName") + private String merchantName; - public void setSortColumns(Field... fields) { - if (fields == null || fields.length == 0) { - return; - } - for (int k = 0; k < fields.length; k++) { - if (fields[k] == null) { - return; - } - } - StringBuilder sb = new StringBuilder(fields[0].toString()); - for (int k = 1; k < fields.length; k++) { - sb.append(","); - sb.append(fields[k].toString()); - } - this.sortColumns = sb.toString(); - } - public void setSortColumns(String sortColumns) { - if (sortColumns == null || "".equals(sortColumns.trim())) { - return; - } - if (sortColumns.contains(",")) { - String[] cols = sortColumns.split(","); - List fList = new ArrayList(); - for (int k = 0; k < cols.length; k++) { - fList.add(Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new Field[fList.size()])); - } else { - this.setSortColumns(Field.valueOf(sortColumns)); - } - } }