fangcheng / regional-platform

Download as
Browse Code »

Commit 3ebd743afc531493720c1a5b8f8052faeb5606c1

Authored by jiangjiazhi
2 parents 7a56af8566 36f9136c6a
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java View file @ 3ebd743
... ... @@ -40,14 +40,14 @@
40 40  
41 41 public List<BasicConfig> queryBasicConfig(BasicConfigQuery basicConfigQuery) {
42 42 MongoQuery query = basicConfigQuery.convertToQuery();
43   - query.addOrder(Sort.Direction.DESC, "modifiedDate");
44 43 if (StringUtils.isNotEmpty(basicConfigQuery.getNeed())) {
45 44 basicConfigQuery.mysqlBuild(basicConfigDao.queryBasicConfigCount(basicConfigQuery.convertToQuery()));
46 45 query.start(basicConfigQuery.getOffset()).end(basicConfigQuery.getLimit());
47 46 }
48 47  
49   - return basicConfigDao.queryBasicConfig(query.addOrder(Direction.ASC, "id"));
  48 + return basicConfigDao.queryBasicConfig(query.addOrder(Direction.ASC, "createDate"));
50 49 }
  50 +
51 51  
52 52 public void batchSave(Collection<BasicConfig> list) {
53 53 basicConfigDao.batchSave(list);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 3ebd743
... ... @@ -579,7 +579,7 @@
579 579 Users users = new Users();
580 580 users.setType(UserTypeEnum.PLATFORM_ADMIN.getId());
581 581 users.setName(name);
582   - user.setOrgId(Integer.parseInt(defaultAdminOrgId));
  582 + users.setOrgId(Integer.parseInt(defaultAdminOrgId));
583 583 users.setAccount(account);
584 584 users.setPhone(phone);
585 585 users.setEnable(enable);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java View file @ 3ebd743
... ... @@ -230,34 +230,39 @@
230 230 result.put("serviceStatusName", ServiceStatusEnums.getNameById(temp.getServiceStatus()));
231 231 result.put("content", temp.getContent());
232 232  
233   - //发送频次
234   - Integer sendFreq = temp.getSendFrequency();
  233 + String str = "一次 预约短信";
  234 + if (temp.getSmsType() != null && temp.getSmsType() != SmsServiceEnums.CJYYTX.getId() && temp.getSmsType() != SmsServiceEnums.CHFCYUTX.getId() && temp.getSmsType() != SmsServiceEnums.EBYYTX.getId())
  235 + {
  236 + //发送频次
  237 + Integer sendFreq = temp.getSendFrequency();
235 238  
236   - String sendDate = SendDateEnums.getNameById(temp.getSendDateType());
  239 + String sendDate = SendDateEnums.getNameById(temp.getSendDateType());
237 240  
238 241  
239   - String dateRange = temp.getStart() == null ? "" : (temp.getStart() + " "+ temp.getEnd());
  242 + String dateRange = temp.getStart() == null ? "" : (temp.getStart() + " "+ temp.getEnd());
240 243  
241   - String date = "";
  244 + String date = "";
242 245  
243   - if (sendFreq != null && temp.getSendDate() != null)
244   - {
245   - if (sendFreq == SendFrequencyEnums.ONCE.getId())
  246 + if (sendFreq != null && temp.getSendDate() != null)
246 247 {
247   - date = DateUtil.getyyyy_MM_dd(temp.getSendDate());
  248 + if (sendFreq == SendFrequencyEnums.ONCE.getId())
  249 + {
  250 + date = DateUtil.getyyyy_MM_dd(temp.getSendDate());
  251 + }
  252 + else if (sendFreq == SendFrequencyEnums.MONTH.getId())
  253 + {
  254 + date = DateUtil.getDD(temp.getSendDate());
  255 + }
  256 + else if (sendFreq == SendFrequencyEnums.YEAR.getId())
  257 + {
  258 + date = DateUtil.getMMdd(temp.getSendDate());
  259 + }
248 260 }
249   - else if (sendFreq == SendFrequencyEnums.MONTH.getId())
250   - {
251   - date = DateUtil.getDD(temp.getSendDate());
252   - }
253   - else if (sendFreq == SendFrequencyEnums.YEAR.getId())
254   - {
255   - date = DateUtil.getMMdd(temp.getSendDate());
256   - }
  261 +
  262 + String splDate = temp.getSpecialDateType() == null ? "" : SpecialDateEnums.getNameById(temp.getSpecialDateType());
  263 + str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate +" "+ date+" "+splDate+ " " +dateRange;
257 264 }
258 265  
259   - String splDate = temp.getSpecialDateType() == null ? "" : SpecialDateEnums.getNameById(temp.getSpecialDateType());
260   - String str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate +" "+ date+" "+splDate+ " " +dateRange;
261 266  
262 267 result.put("sendDate",str);
263 268 result.put("sendTimes", SendTimeEnums.getNameById(temp.getSendTimeType()));