From a23da5b104eb254702c7dadf18c11cf0bb2d8468 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 13 Aug 2019 16:21:49 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=BD=A6=E6=B5=81][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E5=91=98=E8=BD=A6=E6=B5=81=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=BC=B4=E8=B4=B9=E6=97=B6=E9=97=B4=E8=BF=87=E6=BB=A4?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/po/WxCarPayRecord.java | 1 + .../com/iformall/enums/EnumCarPayType.java | 33 +++++++++++++++++++ .../resources/mapper/WxCarPayRecordMapper.xml | 25 ++++++++++---- 3 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumCarPayType.java diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java index d3a3f529b..3468c78ad 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java @@ -39,6 +39,7 @@ public class WxCarPayRecord extends BaseEntity { private String userType; private String feeTimeStr; + @Excel(name="缴费时间",width = 20,orderNum = "7",format="yyyy-MM-dd HH:mm") private Date feeTime; private String coupon; private String couponCode; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCarPayType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCarPayType.java new file mode 100644 index 000000000..d41c3f91e --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCarPayType.java @@ -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; + } +} diff --git a/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml index aa2323443..5f0510109 100644 --- a/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml @@ -58,12 +58,25 @@ and `vendor_type` = #{vendorType} - - and fee_time >= #{startDate} - - - and fee_time <= #{endDate} - + + + + and fee_time >= #{startDate} + + + and fee_time <= #{endDate} + + + + + and create_date >= #{startDate} + + + and create_date <= #{endDate} + + + + and fee is not null and fee != ''