Procházet zdrojové kódy

[合同][修改][开发结算单]

release_toaliyun_real
luozukai před 6 roky
rodič
revize
10706d1365
2 změnil soubory, kde provedl 9 přidání a 2 odebrání
  1. +6
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java
  2. +3
    -2
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 6
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java Zobrazit soubor

@@ -77,5 +77,11 @@ public class WxRentPropertyContractVo extends BaseEntity {


@io.swagger.annotations.ApiModelProperty(value = "审批流类型", name = "businessType") @io.swagger.annotations.ApiModelProperty(value = "审批流类型", name = "businessType")
private Integer businessType; private Integer businessType;

@io.swagger.annotations.ApiModelProperty(value = "联营扣点率", name = "busDiscountRatio")
private String busDiscountRatio;

@io.swagger.annotations.ApiModelProperty(value = "联营扣点-时间范围 1年2月3周期", name = "busDiscountTime")
private Integer busDiscountTime;
} }



+ 3
- 2
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Zobrazit soubor

@@ -354,7 +354,8 @@
<result column="property_status" property="propertyStatus"/> <result column="property_status" property="propertyStatus"/>
<result column="rent_price_unit" property="rentPriceUnit"/> <result column="rent_price_unit" property="rentPriceUnit"/>
<result column="property_price_unit" property="propertyPriceUnit"/> <result column="property_price_unit" property="propertyPriceUnit"/>

<result column="bus_discount_time" property="busDiscountTime"/>
<result column="bus_discount_ratio" property="busDiscountRatio"/>
</resultMap> </resultMap>


<select id="listContractVo" parameterType="com.iformall.domain.vo.WxRentPropertyContractVo" resultMap="contractMap"> <select id="listContractVo" parameterType="com.iformall.domain.vo.WxRentPropertyContractVo" resultMap="contractMap">
@@ -362,7 +363,7 @@
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,pc.`status` as property_status, rc.rent_shop_type,rc.rent_info,pc.price as property_price,rc.merchant_id,pc.`status` as property_status,
rc.price_unit as rent_price_unit,pc.price_unit as property_price_unit, rc.price_unit as rent_price_unit,pc.price_unit as property_price_unit,
rc.business_type businessType
rc.business_type businessType,rc.bus_discount_ratio,rc.bus_discount_time
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>


Načítá se…
Zrušit
Uložit