| @@ -39,6 +39,7 @@ public class WxCarPayRecord extends BaseEntity { | |||||
| private String userType; | private String userType; | ||||
| private String feeTimeStr; | private String feeTimeStr; | ||||
| @Excel(name="缴费时间",width = 20,orderNum = "7",format="yyyy-MM-dd HH:mm") | |||||
| private Date feeTime; | private Date feeTime; | ||||
| private String coupon; | private String coupon; | ||||
| private String couponCode; | private String couponCode; | ||||
| @@ -0,0 +1,33 @@ | |||||
| package com.iformall.enums; | |||||
| public enum EnumCarPayType { | |||||
| NO_PAY(0, "进出场车辆"), | |||||
| PAY(1, "进出场车辆缴费") | |||||
| ; | |||||
| public static EnumCarPayType getEnum(Integer code) { | |||||
| for (EnumCarPayType value : values()) { | |||||
| if (value.getCode().equals(code)) { | |||||
| return value; | |||||
| } | |||||
| } | |||||
| return null; | |||||
| } | |||||
| private Integer code; | |||||
| private String message; | |||||
| EnumCarPayType(Integer code, String message) { | |||||
| this.code = code; | |||||
| this.message = message; | |||||
| } | |||||
| public Integer getCode() { | |||||
| return code; | |||||
| } | |||||
| public String getMessage() { | |||||
| return message; | |||||
| } | |||||
| } | |||||
| @@ -58,12 +58,25 @@ | |||||
| and `vendor_type` = #{vendorType} | and `vendor_type` = #{vendorType} | ||||
| </if> | </if> | ||||
| <if test=" null != startDate"> | |||||
| and fee_time >= #{startDate} | |||||
| </if> | |||||
| <if test=" null != endDate"> | |||||
| and fee_time <= #{endDate} | |||||
| </if> | |||||
| <choose> | |||||
| <when test="1==isPay"> | |||||
| <if test=" null != startDate"> | |||||
| and fee_time >= #{startDate} | |||||
| </if> | |||||
| <if test=" null != endDate"> | |||||
| and fee_time <= #{endDate} | |||||
| </if> | |||||
| </when> | |||||
| <otherwise> | |||||
| <if test=" null != startDate"> | |||||
| and create_date >= #{startDate} | |||||
| </if> | |||||
| <if test=" null != endDate"> | |||||
| and create_date <= #{endDate} | |||||
| </if> | |||||
| </otherwise> | |||||
| </choose> | |||||
| <if test=" 1 == isPay"> | <if test=" 1 == isPay"> | ||||
| and fee is not null | and fee is not null | ||||
| and fee != '' | and fee != '' | ||||