jiangjiazhi / regional-platform

Download as
Browse Code »

Commit fca05cee65321e0cb68c319fac3b6adacd38a5d5

Authored by liquanyu
1 parent 63895466f6
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

短信模板修改

Showing 5 changed files with 52 additions and 4 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/SmsTemplateModel.java View file @ fca05ce
... ... @@ -61,7 +61,17 @@
61 61 private Integer status;
62 62  
63 63  
  64 + //模板类型 0推送 1短信
  65 + private Integer templateType;
64 66 private Integer yn;
  67 +
  68 + public Integer getTemplateType() {
  69 + return templateType;
  70 + }
  71 +
  72 + public void setTemplateType(Integer templateType) {
  73 + this.templateType = templateType;
  74 + }
65 75  
66 76 public Integer getStatus() {
67 77 return status;
platform-dal/src/main/java/com/lyms/platform/query/SmsTemplateQuery.java View file @ fca05ce
... ... @@ -63,6 +63,10 @@
63 63 //启用状态 0未启用 1启用
64 64 private Integer status;
65 65  
  66 + //模板类型 0推送 1短信
  67 + private Integer templateType;
  68 +
  69 +
66 70 @Override
67 71 public MongoQuery convertToQuery() {
68 72 MongoCondition condition = MongoCondition.newInstance();
69 73  
70 74  
... ... @@ -102,11 +106,23 @@
102 106 condition = condition.and("status", status, MongoOper.IS);
103 107 }
104 108  
  109 + if (null != templateType) {
  110 + condition = condition.and("templateType", templateType, MongoOper.IS);
  111 + }
105 112  
  113 +
106 114 if (null != content) {
107 115 condition = condition.and("content", content, MongoOper.LIKE);
108 116 }
109 117 return condition.toMongoQuery();
  118 + }
  119 +
  120 + public Integer getTemplateType() {
  121 + return templateType;
  122 + }
  123 +
  124 + public void setTemplateType(Integer templateType) {
  125 + this.templateType = templateType;
110 126 }
111 127  
112 128 public String getId() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java View file @ fca05ce
... ... @@ -114,15 +114,14 @@
114 114 model.setSendFrequency(request.getSendFrequency());
115 115 model.setServiceObj(request.getServiceObj());
116 116 model.setSendTimeType(request.getSendTimeType());
117   -
118 117 model.setServiceType(request.getServiceType());
119 118 model.setServiceStatus(request.getServiceStatus());
120 119 model.setSmsType(request.getSmsType());
121 120 model.setStart(request.getStart());
122 121 model.setEnd(request.getEnd());
123 122 model.setSpecialDateType(request.getSpecialDateType());
124   -
125 123 model.setStatus(request.getStatus());
  124 + model.setTemplateType(request.getTemplateType());
126 125  
127 126 return model;
128 127 }
129 128  
... ... @@ -190,8 +189,8 @@
190 189 result.setStart(model.getStart());
191 190 result.setEnd(model.getEnd());
192 191 result.setSpecialDateType(model.getSpecialDateType());
193   -
194 192 result.setStatus(model.getStatus());
  193 + result.setTemplateType(model.getTemplateType());
195 194  
196 195 return result;
197 196 }
... ... @@ -214,6 +213,7 @@
214 213 query.setContent(request.getContent());
215 214 query.setServiceObj(request.getServiceObj());
216 215 query.setHospitalId(request.getHospitalId());
  216 + query.setTemplateType(request.getTemplateType());
217 217 if (request.getServiceObj() != null && request.getServiceObj() == 0)
218 218 {
219 219 //查询全部
220 220  
... ... @@ -285,11 +285,11 @@
285 285 str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate +" "+ date+" "+splDate+ " " +dateRange;
286 286 }
287 287  
288   -
289 288 result.put("sendDate",str);
290 289 result.put("sendTimes", SendTimeEnums.getNameById(temp.getSendTimeType()));
291 290 result.put("status",(temp.getStatus() == null || temp.getStatus() == 0 ) ? "未启用" : "启用");
292 291 result.put("model",getSmsTemplateResult(temp));
  292 + result.put("templateType",(temp.getTemplateType() == null || temp.getTemplateType() == 0 ) ? "推送" : "短信");
293 293 results.add(result);
294 294 }
295 295 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java View file @ fca05ce
... ... @@ -64,6 +64,17 @@
64 64 //启用状态 0未启用 1启用
65 65 private Integer status;
66 66  
  67 + //模板类型 0推送 1短信
  68 + private Integer templateType;
  69 +
  70 + public Integer getTemplateType() {
  71 + return templateType;
  72 + }
  73 +
  74 + public void setTemplateType(Integer templateType) {
  75 + this.templateType = templateType;
  76 + }
  77 +
67 78 public Integer getStatus() {
68 79 return status;
69 80 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsTemplateResult.java View file @ fca05ce
... ... @@ -49,6 +49,17 @@
49 49 //启用状态 0未启用 1启用
50 50 private Integer status;
51 51  
  52 + //模板类型 0推送 1短信
  53 + private Integer templateType;
  54 +
  55 + public Integer getTemplateType() {
  56 + return templateType;
  57 + }
  58 +
  59 + public void setTemplateType(Integer templateType) {
  60 + this.templateType = templateType;
  61 + }
  62 +
52 63 public Integer getStatus() {
53 64 return status;
54 65 }