From 501497c142eec48b9c0f23df033ddb11f076e550 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 9 Jun 2018 11:24:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/SmsTemplateFacade.java | 6 ++++-- .../lyms/platform/operate/web/result/SmsTemplateResult.java | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java index 43195e9..030aa1b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java @@ -194,6 +194,8 @@ public class SmsTemplateFacade { result.setStatus(model.getStatus()); result.setTemplateType(model.getTemplateType()); + result.setHealthType(model.getHealthType()); + return result; } @@ -293,9 +295,9 @@ public class SmsTemplateFacade { String splDate = temp.getSpecialDateType() == null ? "" : SpecialDateEnums.getNameById(temp.getSpecialDateType()); str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate +" "+ date+" "+splDate+ " " +dateRange; } - else if (temp.getSmsType() != SmsServiceEnums.EBGQTX.getId()) + else if (temp.getSmsType() != SmsServiceEnums.FWDGTX.getId()) { - str ="一次" +((temp.getHealthType() == null || temp.getHealthType() == 0 ) ? "健康" : "高危") + str ="一次" +((temp.getHealthType() == null || temp.getHealthType() == 0 ) ? "健康" : "高危") + " " + ((temp.getTemplateType() == null || temp.getTemplateType() == 0 ) ? "推送" : "短信"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsTemplateResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsTemplateResult.java index a23135f..8a51a77 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsTemplateResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsTemplateResult.java @@ -52,6 +52,17 @@ public class SmsTemplateResult { //模板类型 0推送 1短信 private Integer templateType; + //健康类型 0健康 1高危 + private Integer healthType; + + public Integer getHealthType() { + return healthType; + } + + public void setHealthType(Integer healthType) { + this.healthType = healthType; + } + public Integer getTemplateType() { return templateType; } -- 1.8.3.1