|
|
|
@@ -60,37 +60,18 @@ public class WxRentContract extends TenantEntity { |
|
|
|
private Date rentalStartDate; |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "祖赁截止时间", name = "rentalEndDate") |
|
|
|
private Date rentalEndDate; |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "计租开始日期", name = "startDate") |
|
|
|
private Date startDate; |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "计租截止日期", name = "endDate") |
|
|
|
private Date endDate; |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "施工图纸", name = "designFile") |
|
|
|
private String designFile; |
|
|
|
@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 = "lease") |
|
|
|
private Integer lease; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "来源ID,针对续签,从哪个合同续签", name = "fromId") |
|
|
|
private Long fromId; |
|
|
|
|
|
|
|
//地址 |
|
|
|
//联系地址 |
|
|
|
private String linkAddress; |
|
|
|
|
|
|
|
@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 = "bankName") |
|
|
|
private String bankName; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "金额小数点位数", name = "decimalSize") |
|
|
|
private Integer decimalSize = Constant.default_short_decimal_size ; |
|
|
|
@TableField(exist = false) |
|
|
|
@@ -98,6 +79,8 @@ public class WxRentContract extends TenantEntity { |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "合同文件路径", name = "filepath") |
|
|
|
private String filepath; |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "fileNames") |
|
|
|
private String fileNames; |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "EnumRentContractStatus", name = "status") |
|
|
|
private Integer status; |
|
|
|
@TableField(exist = false) |
|
|
|
@@ -113,7 +96,6 @@ public class WxRentContract extends TenantEntity { |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "押金金额详细", name = "cashtypeContentLsit") |
|
|
|
private String cashtypeContentLsit; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") |
|
|
|
private Integer isDel; |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updatetime") |
|
|
|
@@ -130,57 +112,22 @@ public class WxRentContract extends TenantEntity { |
|
|
|
private String createByName; |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "计租面积", name = "rentArea") |
|
|
|
private String rentArea; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "店铺编号串", name = "shopIdStr") |
|
|
|
private String shopIdStr; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "类型EnumAgileContractType", name = "type") |
|
|
|
private Integer type; |
|
|
|
@TableField(exist = false) |
|
|
|
private String typeName; |
|
|
|
@TableField(exist = false) |
|
|
|
private List<Integer> typeList; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "审核状态, 0未审核 1审核中 2审核通过 3驳回", name = "applyStatus") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "审核状态, 0未审核 1审核中 2审核通过 3驳回EnumRentContractAppStatus", name = "applyStatus") |
|
|
|
private Integer applyStatus; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "终止时间", name = "endContractTime") |
|
|
|
private Date endContractTime; |
|
|
|
|
|
|
|
@TableField(exist = false) |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams") |
|
|
|
private Map<String, Object> flowParams; |
|
|
|
|
|
|
|
@TableField(exist = false) |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "租赁合同预账单列表", name = "previewBillRentList") |
|
|
|
private List<WxAllBill> previewBillRentList; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "审批说明", name = "remark") |
|
|
|
private String remark; |
|
|
|
|
|
|
|
@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 = "每天价格计算规则EnumRentDayPriceCalcute", name = "dayPriceCalcute") |
|
|
|
private Integer dayPriceCalcute; |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "每月平均天数", name = "monthAverageDays") |
|
|
|
private Integer monthAverageDays; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "是否有工作流 1:有 0:无", name = "flowHas") |
|
|
|
@TableField(exist = false) |
|
|
|
private Integer flowHas; |
|
|
|
|
|
|
|
//联营扣点跳点设置 |
|
|
|
@TableField(exist = false) |
|
|
|
private List<WxRentContractRevenueJump> revenueJumps; |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "联营跳点设置说明", name = "revenueJumpsRemark") |
|
|
|
private String revenueJumpsRemark; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "免租期说明", name = "freePeriodRemark") |
|
|
|
private String freePeriodRemark; |
|
|
|
|
|
|
|
public List<Long> shopIdsByRentInfo() { |
|
|
|
List<Long> shopList = Lists.newArrayList(); |
|
|
|
@@ -254,31 +201,6 @@ public class WxRentContract extends TenantEntity { |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// public Map<Long,WxEnergyFees> getDepositEnergyFees(Map<Long,WxEnergyFees> feesMap) { |
|
|
|
// String dsdstr = this.getCashtypeContentLsit(); |
|
|
|
// if (!StringUtils.isBlank(dsdstr)) { |
|
|
|
// Map<Long,WxEnergyFees> retMap = new HashMap<Long,WxEnergyFees>(); |
|
|
|
// JSONArray rentInfoArray = JSONArray.parseArray(dsdstr); |
|
|
|
// int size = rentInfoArray.size(); |
|
|
|
// for (int i = 0; i < size; i++) { |
|
|
|
// JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); |
|
|
|
// String depositType = rentInfoObject.getString("value"); |
|
|
|
// String deposit = rentInfoObject.getString("deposit"); |
|
|
|
// Long dt = Long.parseLong(depositType); |
|
|
|
// WxEnergyFees fees = feesMap.get(dt); |
|
|
|
// WxEnergyFees nfees = new WxEnergyFees(); |
|
|
|
// nfees.setId(fees.getId()); |
|
|
|
// nfees.setName(fees.getName()); |
|
|
|
// nfees.setCalcuteUnit(fees.getCalcuteUnit()); |
|
|
|
// nfees.setPrice(deposit); |
|
|
|
// retMap.put(dt, nfees); |
|
|
|
// } |
|
|
|
// return retMap; |
|
|
|
// } |
|
|
|
// return null; |
|
|
|
// } |
|
|
|
|
|
|
|
@TableField(exist = false) |
|
|
|
private List<RentContractFreePeriodVo> freePeriods; |
|
|
|
public void setFreeVo(List<WxRentContractFreePeriod> freePeriods) { |
|
|
|
@@ -302,6 +224,24 @@ public class WxRentContract extends TenantEntity { |
|
|
|
this.setFreePeriods(voList); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "是否有工作流 1:有 0:无", name = "flowHas") |
|
|
|
@TableField(exist = false) |
|
|
|
private Integer flowHas; |
|
|
|
//联营扣点跳点设置 |
|
|
|
@TableField(exist = false) |
|
|
|
private List<WxRentContractRevenueJump> revenueJumps; |
|
|
|
@TableField(exist = false) |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams") |
|
|
|
private Map<String, Object> flowParams; |
|
|
|
@TableField(exist = false) |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "租赁合同预账单列表", name = "previewBillRentList") |
|
|
|
private List<WxAllBill> previewBillRentList; |
|
|
|
|
|
|
|
@TableField(exist = false) |
|
|
|
private String typeName; |
|
|
|
@TableField(exist = false) |
|
|
|
private List<Integer> typeList; |
|
|
|
@TableField(exist = false) |
|
|
|
private String building; |
|
|
|
@TableField(exist = false) |
|
|
|
|