jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7678a20716b1f3e01797b37ede273759d55ac76d

Authored by yangfei
2 parents 0dabfebd00 501497c142
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java View file @ 7678a20
... ... @@ -194,6 +194,8 @@
194 194 result.setStatus(model.getStatus());
195 195 result.setTemplateType(model.getTemplateType());
196 196  
  197 + result.setHealthType(model.getHealthType());
  198 +
197 199 return result;
198 200 }
199 201  
200 202  
... ... @@ -293,9 +295,9 @@
293 295 String splDate = temp.getSpecialDateType() == null ? "" : SpecialDateEnums.getNameById(temp.getSpecialDateType());
294 296 str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate +" "+ date+" "+splDate+ " " +dateRange;
295 297 }
296   - else if (temp.getSmsType() != SmsServiceEnums.EBGQTX.getId())
  298 + else if (temp.getSmsType() != SmsServiceEnums.FWDGTX.getId())
297 299 {
298   - str ="一次" +((temp.getHealthType() == null || temp.getHealthType() == 0 ) ? "健康" : "高危")
  300 + str ="一次" +((temp.getHealthType() == null || temp.getHealthType() == 0 ) ? "健康" : "高危") + " "
299 301 + ((temp.getTemplateType() == null || temp.getTemplateType() == 0 ) ? "推送" : "短信");
300 302 }
301 303  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsTemplateResult.java View file @ 7678a20
... ... @@ -52,6 +52,17 @@
52 52 //模板类型 0推送 1短信
53 53 private Integer templateType;
54 54  
  55 + //健康类型 0健康 1高危
  56 + private Integer healthType;
  57 +
  58 + public Integer getHealthType() {
  59 + return healthType;
  60 + }
  61 +
  62 + public void setHealthType(Integer healthType) {
  63 + this.healthType = healthType;
  64 + }
  65 +
55 66 public Integer getTemplateType() {
56 67 return templateType;
57 68 }