diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index 9fe6bedd8..ddba07f15 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -205,7 +205,7 @@ public class WxPropertyContract extends TenantEntity { 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; @io.swagger.annotations.ApiModelProperty(value = "操作类型1区分租赁物业2合并租赁物业", name = "operationType") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index b6caeca0c..9a10ab811 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -425,7 +425,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService //重新生成 record.setRentalStartDate(wxPropertyContract.getRentalStartDate()); record.setRentalEndDate(wxPropertyContract.getRentalEndDate()); - record.setRentStartType(wxPropertyContract.getRentStartType()); + //切换的时候需要用传过来的类型 + if (null == record.getRentStartType()) { + record.setRentStartType(wxPropertyContract.getRentStartType()); + } record.setStartDate(wxPropertyContract.getStartDate()); record.setEndDate(wxPropertyContract.getEndDate()); record.setAdjustPeriod(wxPropertyContract.getAdjustPeriod());