shiyang / regional-platform

Download as
Browse Code ยป

Commit 945b6b1361b6486264f54e4fbef9d9216027bbf1

Authored by jiangjiazhi
2 parents 2a8b29d524 50d9bdada4
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/SmsTimeTypeEnums.java View file @ 945b6b1
... ... @@ -13,13 +13,16 @@
13 13  
14 14 private String title;
15 15  
16   - public SmsTimeTypeEnums getEnum(int id) {
17   - for (SmsTimeTypeEnums yn : values()) {
18   - if (yn.getId() == id) {
19   - return yn;
  16 + public static String getNameById(Integer id) {
  17 + if (id != null)
  18 + {
  19 + for (SmsTimeTypeEnums yn : values()) {
  20 + if (yn.getId() == id) {
  21 + return yn.getTitle();
  22 + }
20 23 }
21 24 }
22   - return null;
  25 + return "";
23 26 }
24 27  
25 28 public int getId() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java View file @ 945b6b1
... ... @@ -698,6 +698,7 @@
698 698 {
699 699 map.put("actualTime", "");
700 700 }
  701 + map.put("timeType",SmsTimeTypeEnums.getNameById(obj.getTimeType()));
701 702  
702 703 map.put("smsStatus", SmsStatusEnums.getNameById(obj.getStatus()));
703 704 list.add(map);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsObj.java View file @ 945b6b1
... ... @@ -20,6 +20,15 @@
20 20 private Integer sendCount;
21 21 private Integer subTypeId;
22 22 private Integer typeId;
  23 + private Integer timeType;
  24 +
  25 + public Integer getTimeType() {
  26 + return timeType;
  27 + }
  28 +
  29 + public void setTimeType(Integer timeType) {
  30 + this.timeType = timeType;
  31 + }
23 32  
24 33 public String getPhone() {
25 34 return phone;