Sfoglia il codice sorgente

[统计][修改][调整业态分析列表精度]

release_toaliyun_real
luozukai 6 anni fa
parent
commit
692fed8e94
10 ha cambiato i file con 3 aggiunte e 9 eliminazioni
  1. +1
    -0
      mallinkAdmin/src/main/resources/db/migration/V201907041600__L_ALTER_MER.sql
  2. +0
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
  3. +0
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java
  4. +0
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java
  5. +0
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
  6. +0
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
  7. +0
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  8. +0
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java
  9. +1
    -1
      mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml
  10. +1
    -1
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 1
- 0
mallinkAdmin/src/main/resources/db/migration/V201907041600__L_ALTER_MER.sql Vedi File

@@ -0,0 +1 @@
update wx_merchant set link_line_phone = link_person where link_line_phone is null;

+ 0
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java Vedi File

@@ -52,7 +52,6 @@ public class WxBillDaily extends BaseEntity{

@Excel(name = "缴款截止日期*", orderNum = "5", width = 20, format = "yyyy-MM-dd")
@NotNull
@SortColumn(column = "receiveDate")
@io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate")
private Date receiveDate;



+ 0
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java Vedi File

@@ -56,7 +56,6 @@ public class WxBillOther extends BaseEntity {
private Long pay;

@Excel(name = "缴款截止日期", orderNum = "7", width = 20, format = "yyyy-MM-dd")
@SortColumn(column = "receiveDate")
@io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate")
private Date receiveDate;



+ 0
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java Vedi File

@@ -55,7 +55,6 @@ public class WxBillOtherDeposit extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "pay")
private Long pay;

@SortColumn(column = "receiveDate")
@io.swagger.annotations.ApiModelProperty(value = "截止收款日期", name = "receiveDate")
private Date receiveDate;



+ 0
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java Vedi File

@@ -68,7 +68,6 @@ public class WxBillProperty extends BaseEntity {
private Long pay;

@Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "10")
@SortColumn(column = "receiveDate")
@io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate")
private Date receiveDate;



+ 0
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java Vedi File

@@ -67,7 +67,6 @@ public class WxBillRent extends BaseEntity {
private Long pay;

@Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "10")
@SortColumn(column = "receiveDate")
@io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate")
private Date receiveDate;



+ 0
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java Vedi File

@@ -81,7 +81,6 @@ public class WxRentContract extends BaseEntity {
private Integer owe;

@Transient
@SortColumn(column = "receiveDate")
private String receiveDate;

@Transient


+ 0
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java Vedi File

@@ -114,7 +114,6 @@ public class WxBillAll extends BaseEntity {
@SortColumn(column = "owe")
private Integer owe;
@Transient
@SortColumn(column = "receiveDate")
private String receiveDate;
@Transient
@SortColumn(column = "payDate")


+ 1
- 1
mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml Vedi File

@@ -145,7 +145,7 @@
</where>

<if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null == sortColumns">order by rc.id desc</if>
<if test=" null == sortColumns">order by rc.createtime desc,rc.id desc</if>
</select>
<select id="queryRentContractWaitSignStatus" resultType="int"


+ 1
- 1
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Vedi File

@@ -152,7 +152,7 @@
<if test=" null != operationType ">and `operation_type` = #{operationType}</if>
</where>
<if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null == sortColumns"> order by rc.id desc </if>
<if test=" null == sortColumns"> order by rc.createtime desc,rc.id desc </if>

</select>


Caricamento…
Annulla
Salva