winter пре 1 година
родитељ
комит
f13810ab69
2 измењених фајлова са 5 додато и 2 уклоњено
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
  2. +4
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java Прегледај датотеку

@@ -205,7 +205,7 @@ public class WxPropertyContract extends TenantEntity {
private String subjectName; private String subjectName;




@io.swagger.annotations.ApiModelProperty(value = "1按租赁日生产2按计租日生成账单", name = "rentStartType")
@io.swagger.annotations.ApiModelProperty(value = "1按租赁日生产2按计租日生成账单EnumRentStartType", name = "rentStartType")
private Integer rentStartType; private Integer rentStartType;


@io.swagger.annotations.ApiModelProperty(value = "操作类型1区分租赁物业2合并租赁物业", name = "operationType") @io.swagger.annotations.ApiModelProperty(value = "操作类型1区分租赁物业2合并租赁物业", name = "operationType")


+ 4
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Прегледај датотеку

@@ -425,7 +425,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
//重新生成 //重新生成
record.setRentalStartDate(wxPropertyContract.getRentalStartDate()); record.setRentalStartDate(wxPropertyContract.getRentalStartDate());
record.setRentalEndDate(wxPropertyContract.getRentalEndDate()); record.setRentalEndDate(wxPropertyContract.getRentalEndDate());
record.setRentStartType(wxPropertyContract.getRentStartType());
//切换的时候需要用传过来的类型
if (null == record.getRentStartType()) {
record.setRentStartType(wxPropertyContract.getRentStartType());
}
record.setStartDate(wxPropertyContract.getStartDate()); record.setStartDate(wxPropertyContract.getStartDate());
record.setEndDate(wxPropertyContract.getEndDate()); record.setEndDate(wxPropertyContract.getEndDate());
record.setAdjustPeriod(wxPropertyContract.getAdjustPeriod()); record.setAdjustPeriod(wxPropertyContract.getAdjustPeriod());


Loading…
Откажи
Сачувај