| @@ -150,23 +150,11 @@ public class WxMerchant extends BaseEntity { | |||||
| } | } | ||||
| public String getBusinessName() { | public String getBusinessName() { | ||||
| if (businessId != null) { | |||||
| EnumBusiness e = EnumBusiness.getEnum(businessId); | |||||
| if (e != null) return e.getMessage(); | |||||
| else return null; | |||||
| } else { | |||||
| return null; | |||||
| } | |||||
| return EnumBusiness.getEnumMessage(businessId); | |||||
| } | } | ||||
| public String getSubBusinessName() { | public String getSubBusinessName() { | ||||
| if (subBusinessId != null) { | |||||
| EnumSubBusiness e = EnumSubBusiness.getEnum(subBusinessId); | |||||
| if (e != null) return e.getMessage(); | |||||
| else return null; | |||||
| } else { | |||||
| return null; | |||||
| } | |||||
| return EnumSubBusiness.getEnumMessage(subBusinessId); | |||||
| } | } | ||||
| @Transient | @Transient | ||||
| @@ -130,23 +130,11 @@ public class WxMerchantTradeDailyVo extends BaseEntity { | |||||
| } | } | ||||
| public String getBusinessName() { | public String getBusinessName() { | ||||
| if (businessId != null) { | |||||
| EnumBusiness e = EnumBusiness.getEnum(businessId); | |||||
| if (e != null) return e.getMessage(); | |||||
| else return null; | |||||
| } else { | |||||
| return null; | |||||
| } | |||||
| return EnumBusiness.getEnumMessage(businessId); | |||||
| } | } | ||||
| public String getSubBusinessName() { | public String getSubBusinessName() { | ||||
| if (subBusinessId != null) { | |||||
| EnumSubBusiness e = EnumSubBusiness.getEnum(subBusinessId); | |||||
| if (e != null) return e.getMessage(); | |||||
| else return null; | |||||
| } else { | |||||
| return null; | |||||
| } | |||||
| return EnumSubBusiness.getEnumMessage(subBusinessId); | |||||
| } | } | ||||
| } | } | ||||
| @@ -1,5 +1,8 @@ | |||||
| package com.iformall.enums; | package com.iformall.enums; | ||||
| import java.util.HashMap; | |||||
| import java.util.Map; | |||||
| /** | /** | ||||
| * Created by Stormeye on 2018/08/09. | * Created by Stormeye on 2018/08/09. | ||||
| */ | */ | ||||
| @@ -21,16 +24,27 @@ public enum EnumBusiness { | |||||
| ; | ; | ||||
| public static EnumBusiness getEnum(Integer code) { | public static EnumBusiness getEnum(Integer code) { | ||||
| for (EnumBusiness value : values()) { | |||||
| if (value.getCode().equals(code)) { | |||||
| return value; | |||||
| } | |||||
| } | |||||
| return null; | |||||
| if (code == null) return null; | |||||
| return map.get(code); | |||||
| } | |||||
| public static String getEnumMessage(Integer code) { | |||||
| if (code == null) return null; | |||||
| if (map.get(code) == null) | |||||
| return null; | |||||
| return map.get(code).getMessage(); | |||||
| } | } | ||||
| private Integer code; | private Integer code; | ||||
| private String message; | private String message; | ||||
| private static Map<Integer,EnumBusiness> map | |||||
| = new HashMap<Integer,EnumBusiness>(){ | |||||
| { | |||||
| for (EnumBusiness value : values()) { | |||||
| map.put(value.code, value); | |||||
| } | |||||
| } | |||||
| }; | |||||
| EnumBusiness(Integer code, String message) { | EnumBusiness(Integer code, String message) { | ||||
| this.code = code; | this.code = code; | ||||
| @@ -1,5 +1,8 @@ | |||||
| package com.iformall.enums; | package com.iformall.enums; | ||||
| import java.util.HashMap; | |||||
| import java.util.Map; | |||||
| /** | /** | ||||
| * Created by Stormeye on 2018/08/09. | * Created by Stormeye on 2018/08/09. | ||||
| */ | */ | ||||
| @@ -31,17 +34,29 @@ public enum EnumSubBusiness { | |||||
| public static EnumSubBusiness getEnum(Integer code) { | public static EnumSubBusiness getEnum(Integer code) { | ||||
| for (EnumSubBusiness value : values()) { | |||||
| if (value.getCode().equals(code)) { | |||||
| return value; | |||||
| } | |||||
| } | |||||
| return null; | |||||
| if (code == null) return null; | |||||
| return map.get(code); | |||||
| } | |||||
| public static String getEnumMessage(Integer code) { | |||||
| if (code == null) return null; | |||||
| if (map.get(code) == null) | |||||
| return null; | |||||
| return map.get(code).getMessage(); | |||||
| } | } | ||||
| private Integer code; | private Integer code; | ||||
| private String message; | private String message; | ||||
| private static Map<Integer,EnumSubBusiness> map | |||||
| = new HashMap<Integer,EnumSubBusiness>(){ | |||||
| { | |||||
| for (EnumSubBusiness value : values()) { | |||||
| map.put(value.code, value); | |||||
| } | |||||
| } | |||||
| }; | |||||
| EnumSubBusiness(Integer code, String message) { | EnumSubBusiness(Integer code, String message) { | ||||
| this.code = code; | this.code = code; | ||||
| this.message = message; | this.message = message; | ||||
| @@ -139,7 +139,8 @@ | |||||
| </if> | </if> | ||||
| <if test=" null != startTime and null != endTime"> | <if test=" null != startTime and null != endTime"> | ||||
| and mtd.report_date between #{startTime} and #{endTime} | |||||
| and mtd.report_date >= date_format(#{startTime},'%Y-%m-%d') | |||||
| and mtd.report_date <= date_format(#{endTime},'%Y-%m-%d') | |||||
| </if> | </if> | ||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | <if test=" null != sortColumns"> order by ${sortColumns} </if> | ||||