Просмотр исходного кода

[合同管理][修改][实体]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
d90cafd719
4 измененных файлов: 7 добавлений и 7 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 1
- 1
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<String, Object> result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize);
return new ResultData(result);
}


+ 3
- 3
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() {


+ 2
- 2
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<String,Object> updateStatus(String tenantId){
Map<String,Object> 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);


+ 1
- 1
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Просмотреть файл

@@ -9,7 +9,7 @@
<result column="rental_end_date" jdbcType="TIMESTAMP" property="rentalEndDate"/>
<result column="sign_date" jdbcType="TIMESTAMP" property="signDate"/>
<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="status" jdbcType="INTEGER" property="status"/>
<result column="contract_number" jdbcType="VARCHAR" property="contractNumber"/>


Загрузка…
Отмена
Сохранить