| @@ -0,0 +1 @@ | |||||
| update wx_merchant set link_line_phone = link_person where link_line_phone is null; | |||||
| @@ -52,7 +52,6 @@ public class WxBillDaily extends BaseEntity{ | |||||
| @Excel(name = "缴款截止日期*", orderNum = "5", width = 20, format = "yyyy-MM-dd") | @Excel(name = "缴款截止日期*", orderNum = "5", width = 20, format = "yyyy-MM-dd") | ||||
| @NotNull | @NotNull | ||||
| @SortColumn(column = "receiveDate") | |||||
| @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") | @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") | ||||
| private Date receiveDate; | private Date receiveDate; | ||||
| @@ -56,7 +56,6 @@ public class WxBillOther extends BaseEntity { | |||||
| private Long pay; | private Long pay; | ||||
| @Excel(name = "缴款截止日期", orderNum = "7", width = 20, format = "yyyy-MM-dd") | @Excel(name = "缴款截止日期", orderNum = "7", width = 20, format = "yyyy-MM-dd") | ||||
| @SortColumn(column = "receiveDate") | |||||
| @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") | @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") | ||||
| private Date receiveDate; | private Date receiveDate; | ||||
| @@ -55,7 +55,6 @@ public class WxBillOtherDeposit extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "pay") | @io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "pay") | ||||
| private Long pay; | private Long pay; | ||||
| @SortColumn(column = "receiveDate") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "截止收款日期", name = "receiveDate") | @io.swagger.annotations.ApiModelProperty(value = "截止收款日期", name = "receiveDate") | ||||
| private Date receiveDate; | private Date receiveDate; | ||||
| @@ -68,7 +68,6 @@ public class WxBillProperty extends BaseEntity { | |||||
| private Long pay; | private Long pay; | ||||
| @Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "10") | @Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "10") | ||||
| @SortColumn(column = "receiveDate") | |||||
| @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | ||||
| private Date receiveDate; | private Date receiveDate; | ||||
| @@ -67,7 +67,6 @@ public class WxBillRent extends BaseEntity { | |||||
| private Long pay; | private Long pay; | ||||
| @Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "10") | @Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "10") | ||||
| @SortColumn(column = "receiveDate") | |||||
| @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | ||||
| private Date receiveDate; | private Date receiveDate; | ||||
| @@ -81,7 +81,6 @@ public class WxRentContract extends BaseEntity { | |||||
| private Integer owe; | private Integer owe; | ||||
| @Transient | @Transient | ||||
| @SortColumn(column = "receiveDate") | |||||
| private String receiveDate; | private String receiveDate; | ||||
| @Transient | @Transient | ||||
| @@ -114,7 +114,6 @@ public class WxBillAll extends BaseEntity { | |||||
| @SortColumn(column = "owe") | @SortColumn(column = "owe") | ||||
| private Integer owe; | private Integer owe; | ||||
| @Transient | @Transient | ||||
| @SortColumn(column = "receiveDate") | |||||
| private String receiveDate; | private String receiveDate; | ||||
| @Transient | @Transient | ||||
| @SortColumn(column = "payDate") | @SortColumn(column = "payDate") | ||||
| @@ -145,7 +145,7 @@ | |||||
| </where> | </where> | ||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | <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> | ||||
| <select id="queryRentContractWaitSignStatus" resultType="int" | <select id="queryRentContractWaitSignStatus" resultType="int" | ||||
| @@ -152,7 +152,7 @@ | |||||
| <if test=" null != operationType ">and `operation_type` = #{operationType}</if> | <if test=" null != operationType ">and `operation_type` = #{operationType}</if> | ||||
| </where> | </where> | ||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | <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> | ||||