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

[租赁物业合同][修改][查询添加物业状态字段]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
40e5db7774
2 измененных файлов: 6 добавлений и 2 удалений
  1. +4
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java
  2. +2
    -1
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 4
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java Просмотреть файл

@@ -56,7 +56,7 @@ public class WxRentPropertyContractVo extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "计租类型", name = "type") @io.swagger.annotations.ApiModelProperty(value = "计租类型", name = "type")
private Integer type; private Integer type;


@io.swagger.annotations.ApiModelProperty(value = "合同状态", name = "status")
@io.swagger.annotations.ApiModelProperty(value = "租赁合同状态", name = "status")
private Integer status; private Integer status;


@io.swagger.annotations.ApiModelProperty(value = "审批状态", name = "applyStatus") @io.swagger.annotations.ApiModelProperty(value = "审批状态", name = "applyStatus")
@@ -74,5 +74,8 @@ public class WxRentPropertyContractVo extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "商户ID", name = "merchantId") @io.swagger.annotations.ApiModelProperty(value = "商户ID", name = "merchantId")
private Long merchantId; private Long merchantId;


@io.swagger.annotations.ApiModelProperty(value = "物业合同状态", name = "propertyStatus")
private Integer propertyStatus;

} }



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

@@ -316,13 +316,14 @@
<result column="operation_type" property="operationType"/> <result column="operation_type" property="operationType"/>
<result column="rent_shop_type" property="rentShopType"/> <result column="rent_shop_type" property="rentShopType"/>
<result column="merchant_id" property="merchantId"/> <result column="merchant_id" property="merchantId"/>
<result column="property_status" property="propertyStatus"/>
</resultMap> </resultMap>
<select id="listContractVo" parameterType="com.iformall.domain.vo.WxRentPropertyContractVo" resultMap="contractMap"> <select id="listContractVo" parameterType="com.iformall.domain.vo.WxRentPropertyContractVo" resultMap="contractMap">
select rc.id,rc.merchant_name,rc.rental_start_date,rc.rental_end_date,rc.`status`, select rc.id,rc.merchant_name,rc.rental_start_date,rc.rental_end_date,rc.`status`,
rc.price as rent_price,rc.contract_number,s.shop_number,rc.type,rc.apply_status, rc.price as rent_price,rc.contract_number,s.shop_number,rc.type,rc.apply_status,
rc.rent_shop_type,rc.rent_info,pc.price as property_price,rc.merchant_id
rc.rent_shop_type,rc.rent_info,pc.price as property_price,rc.merchant_id,pc.`status` as property_status
from wx_rent_contract rc left join wx_property_contract pc on rc.id=pc.rent_contract_id from wx_rent_contract rc left join wx_property_contract pc on rc.id=pc.rent_contract_id
left join wx_shop s on rc.shop_id=s.id left join wx_shop s on rc.shop_id=s.id
<where> <where>


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