diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java index f746f8ef7..3fe9aa45b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java @@ -34,7 +34,7 @@ public class WxRentContractController extends BaseController { if (null == wxRentContract) { wxRentContract = new WxRentContract(); } - wxRentContract.setTenantId(Integer.valueOf(getTenantId())); + wxRentContract.setTenantId(getTenantId()); Map result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize); return new ResultData(result); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 29dc563d3..1d8ed6321 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -71,7 +71,7 @@ public class WxRentContract implements Serializable { private Integer receivePeriod; /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private Integer tenantId; + private String tenantId; /*合同文件路径**/ @io.swagger.annotations.ApiModelProperty(value="合同文件路径",name="filepath") private String filepath; @@ -154,10 +154,10 @@ public class WxRentContract implements Serializable { public void setReceivePeriod(Integer _receivePeriod) { receivePeriod = _receivePeriod; } - public Integer getTenantId() { + public String getTenantId() { return tenantId; } - public void setTenantId(Integer _tenantId) { + public void setTenantId(String _tenantId) { tenantId = _tenantId; } public String getFilepath() { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 1ef1c078c..eeab8fc80 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -118,7 +118,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { resultData.put("shopLeftInfo",shopLeftInfo); //待签约 WxRentContract wxRentContract = new WxRentContract(); - wxRentContract.setTenantId(Integer.valueOf(tenantId)); + wxRentContract.setTenantId(tenantId); wxRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); int waitSignCount=wxRentContractMapper.queryRentContractWaitSignStatus(wxRentContract); resultData.put("waitSignCount",waitSignCount); @@ -145,7 +145,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { public Map updateStatus(String tenantId){ Map resultData=new HashMap(); WxRentContract wxRentContract = new WxRentContract(); - wxRentContract.setTenantId(Integer.valueOf(tenantId)); + wxRentContract.setTenantId(tenantId); //将到期 wxRentContract.setStatus(EnumRentContractStatus.CONTRACT_END_SOON.getCode()); int endSoonCount=wxRentContractMapper.queryRentContractEndSoonStatus(wxRentContract); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index ca6afc680..564a647a7 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -9,7 +9,7 @@ - +