| @@ -34,7 +34,7 @@ public class WxRentContractController extends BaseController { | |||||
| if (null == wxRentContract) { | if (null == wxRentContract) { | ||||
| wxRentContract = new WxRentContract(); | wxRentContract = new WxRentContract(); | ||||
| } | } | ||||
| wxRentContract.setTenantId(Integer.valueOf(getTenantId())); | |||||
| wxRentContract.setTenantId(getTenantId()); | |||||
| Map<String, Object> result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize); | Map<String, Object> result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize); | ||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| @@ -71,7 +71,7 @@ public class WxRentContract implements Serializable { | |||||
| private Integer receivePeriod; | private Integer receivePeriod; | ||||
| /*租户ID**/ | /*租户ID**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private Integer tenantId; | |||||
| private String tenantId; | |||||
| /*合同文件路径**/ | /*合同文件路径**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="合同文件路径",name="filepath") | @io.swagger.annotations.ApiModelProperty(value="合同文件路径",name="filepath") | ||||
| private String filepath; | private String filepath; | ||||
| @@ -154,10 +154,10 @@ public class WxRentContract implements Serializable { | |||||
| public void setReceivePeriod(Integer _receivePeriod) { | public void setReceivePeriod(Integer _receivePeriod) { | ||||
| receivePeriod = _receivePeriod; | receivePeriod = _receivePeriod; | ||||
| } | } | ||||
| public Integer getTenantId() { | |||||
| public String getTenantId() { | |||||
| return tenantId; | return tenantId; | ||||
| } | } | ||||
| public void setTenantId(Integer _tenantId) { | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | tenantId = _tenantId; | ||||
| } | } | ||||
| public String getFilepath() { | public String getFilepath() { | ||||
| @@ -118,7 +118,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| resultData.put("shopLeftInfo",shopLeftInfo); | resultData.put("shopLeftInfo",shopLeftInfo); | ||||
| //待签约 | //待签约 | ||||
| WxRentContract wxRentContract = new WxRentContract(); | WxRentContract wxRentContract = new WxRentContract(); | ||||
| wxRentContract.setTenantId(Integer.valueOf(tenantId)); | |||||
| wxRentContract.setTenantId(tenantId); | |||||
| wxRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); | wxRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); | ||||
| int waitSignCount=wxRentContractMapper.queryRentContractWaitSignStatus(wxRentContract); | int waitSignCount=wxRentContractMapper.queryRentContractWaitSignStatus(wxRentContract); | ||||
| resultData.put("waitSignCount",waitSignCount); | resultData.put("waitSignCount",waitSignCount); | ||||
| @@ -145,7 +145,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| public Map<String,Object> updateStatus(String tenantId){ | public Map<String,Object> updateStatus(String tenantId){ | ||||
| Map<String,Object> resultData=new HashMap(); | Map<String,Object> resultData=new HashMap(); | ||||
| WxRentContract wxRentContract = new WxRentContract(); | WxRentContract wxRentContract = new WxRentContract(); | ||||
| wxRentContract.setTenantId(Integer.valueOf(tenantId)); | |||||
| wxRentContract.setTenantId(tenantId); | |||||
| //将到期 | //将到期 | ||||
| wxRentContract.setStatus(EnumRentContractStatus.CONTRACT_END_SOON.getCode()); | wxRentContract.setStatus(EnumRentContractStatus.CONTRACT_END_SOON.getCode()); | ||||
| int endSoonCount=wxRentContractMapper.queryRentContractEndSoonStatus(wxRentContract); | int endSoonCount=wxRentContractMapper.queryRentContractEndSoonStatus(wxRentContract); | ||||
| @@ -9,7 +9,7 @@ | |||||
| <result column="rental_end_date" jdbcType="TIMESTAMP" property="rentalEndDate"/> | <result column="rental_end_date" jdbcType="TIMESTAMP" property="rentalEndDate"/> | ||||
| <result column="sign_date" jdbcType="TIMESTAMP" property="signDate"/> | <result column="sign_date" jdbcType="TIMESTAMP" property="signDate"/> | ||||
| <result column="receive_period" jdbcType="INTEGER" property="receivePeriod"/> | <result column="receive_period" jdbcType="INTEGER" property="receivePeriod"/> | ||||
| <result column="tenant_id" jdbcType="INTEGER" property="tenantId"/> | |||||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> | |||||
| <result column="filepath" jdbcType="VARCHAR" property="filepath"/> | <result column="filepath" jdbcType="VARCHAR" property="filepath"/> | ||||
| <result column="status" jdbcType="INTEGER" property="status"/> | <result column="status" jdbcType="INTEGER" property="status"/> | ||||
| <result column="contract_number" jdbcType="VARCHAR" property="contractNumber"/> | <result column="contract_number" jdbcType="VARCHAR" property="contractNumber"/> | ||||