Przeglądaj źródła

[优化合同][修改][开发优化合同需求]

release_toaliyun_real
luozukai 7 lat temu
rodzic
commit
24e0c6549c
8 zmienionych plików z 42 dodań i 4 usunięć
  1. +13
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  3. +9
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
  4. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  5. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java
  6. +1
    -0
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
  7. +2
    -2
      mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml
  8. +2
    -1
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 13
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java Wyświetl plik

@@ -145,6 +145,19 @@ public class WxBillRent extends BaseEntity {
@Transient
@SortColumn(column = "allPeriod")
private Integer allPeriod;
@Transient
@SortColumn(column = "shopNumber")
private String shopNumber;
@Transient
private Integer depositStatus;

public Integer getDepositStatus() {
return depositStatus;
}

public void setDepositStatus(Integer depositStatus) {
this.depositStatus = depositStatus;
}

public Integer getAllPeriod() {
return allPeriod;


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java Wyświetl plik

@@ -216,7 +216,7 @@ public class WxCoupon extends BaseEntity {
@Transient
private Integer pressCount;
@Transient
private Integer changeRate;
private String changeRate;
@Transient
@SortColumn(column = "join_count")
private Integer pressJoinCount;


+ 9
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java Wyświetl plik

@@ -189,7 +189,16 @@ public class WxPropertyContract extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "租赁单价", name = "rentPrice")
private Integer rentPrice;

@io.swagger.annotations.ApiModelProperty(value = "租金单位1日2月3年", name = "priceUnit")
private Integer priceUnit;

public Integer getPriceUnit() {
return priceUnit;
}

public void setPriceUnit(Integer priceUnit) {
this.priceUnit = priceUnit;
}
public Integer getTotalPeriodMonth() {
return totalPeriodMonth;
}


+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java Wyświetl plik

@@ -339,6 +339,17 @@ public class WxRentContract extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "租赁单价", name = "rentPrice")
private Integer rentPrice;

@io.swagger.annotations.ApiModelProperty(value = "租金单位1日2月3年", name = "priceUnit")
private Integer priceUnit;

public Integer getPriceUnit() {
return priceUnit;
}

public void setPriceUnit(Integer priceUnit) {
this.priceUnit = priceUnit;
}

public Integer getTotalPeriodMonth() {
return totalPeriodMonth;
}


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java Wyświetl plik

@@ -95,6 +95,9 @@ public class WxBillAll extends BaseEntity {
@Transient
@SortColumn(column = "totalReceivePay")
private Integer totalReceivePay;
@Transient
@SortColumn(column = "shopNumber")
private String shopNumber;


@io.swagger.annotations.ApiModelProperty(value = "过滤已收金额1过滤", name = "filterHasPay")


+ 1
- 0
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml Wyświetl plik

@@ -114,6 +114,7 @@
<if test=" null != rentContractId ">and br.`rent_contract_id` = #{rentContractId}</if>
<if test=" null != payWay ">and br.`pay_way` = #{payWay}</if>
<if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if>
<if test=" null != depositStatus ">and d.`status` = #{depositStatus}</if>

</where>
<if test=" null != sortColumns">order by ${sortColumns}</if>


+ 2
- 2
mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml Wyświetl plik

@@ -41,7 +41,7 @@
<result column="total_period_month" property="totalPeriodMonth"/>
<result column="total_period_day" property="totalPeriodDay"/>
<result column="rent_price" property="rentPrice"/>
<result column="price_unit" property="priceUnit"/>
</resultMap>
<sql id="allColumns">
@@ -51,7 +51,7 @@
`shop_type`,`shop_id`,`updatetime`,`createtime`,`rent_area`,
`link_person`,`link_phone`,`pay_account`,`filename`,`lease`,`rent_contract_id`,
`start_date`,`end_date`,`apply_status`,`adjust_period`,`business_type`,adjust_ratio,`rent_info`, `file_names`,
total_period_month,total_period_day,rent_price
total_period_month,total_period_day,rent_price,price_unit
</sql>
<sql id="dynamicWhereConditions">


+ 2
- 1
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Wyświetl plik

@@ -47,6 +47,7 @@
<result column="total_period_month" property="totalPeriodMonth"/>
<result column="total_period_day" property="totalPeriodDay"/>
<result column="rent_price" property="rentPrice"/>
<result column="price_unit" property="priceUnit"/>

</resultMap>
@@ -57,7 +58,7 @@
`pay_account`,`filename`,`lease`,`type`,`revenue`,`adjust_ratio`,`adjust_period`,`pay_ratio`,
`start_date`,`end_date`,
`apply_status`,`bank_name`,`rent_shop_type`,`fix_start_date`,`fix_end_date`,
`business_type`,`rent_info`, `file_names`,total_period_month,total_period_day,rent_price
`business_type`,`rent_info`, `file_names`,total_period_month,total_period_day,rent_price,price_unit

</sql>


Ładowanie…
Anuluj
Zapisz