jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 40af2d2edaaaabcf168b1d847877c6e45330172e

Authored by jiangjiazhi
2 parents 5aa015e0e8 a1d14d38b0
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 40af2d2
... ... @@ -293,91 +293,131 @@
293 293 List<SmsTemplateModel> temps = smsTemplateService.querySmsTemplates(query);
294 294 if (CollectionUtils.isNotEmpty(temps))
295 295 {
  296 +
296 297 for (SmsTemplateModel temp : temps)
297 298 {
298 299 if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus)
299 300 {
300 301 sendList.add(temp);
301   - break;
302 302 }
303   - }
304   -
305   - for (SmsTemplateModel temp : temps)
306   - {
307   - if (temp.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId())
  303 + else if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus)
308 304 {
309   - if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() )
310   - {
311   - sendList.add(temp);
312   - break;
313   - }
  305 + sendList.add(temp);
314 306 }
315   - }
316   -
317   - for (SmsTemplateModel temp : temps)
318   - {
319   - if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId())
  307 + else if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId())
320 308 {
321 309 if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId()
322 310 || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()|| serviceStatus == ServiceStatusEnums.SUSPEND.getId())
323 311 {
324 312 sendList.add(temp);
325   - break;
326 313 }
327 314 }
328   - }
329   -
330   -
331   - for (SmsTemplateModel temp : temps)
  315 + else if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId())
332 316 {
333   - if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId())
  317 + if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() )
334 318 {
335   - if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() )
336   - {
337   - sendList.add(temp);
338   - break;
339   - }
  319 + sendList.add(temp);
340 320 }
341 321 }
342   -
343   -
344   -
345   - for (SmsTemplateModel temp : temps)
  322 + else if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId())
346 323 {
347   - if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId())
  324 + if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() )
348 325 {
349   - if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() )
350   - {
351   - sendList.add(temp);
352   - break;
353   - }
  326 + sendList.add(temp);
354 327 }
355 328 }
356   -
357   -
358   -
359   - for (SmsTemplateModel temp : temps)
  329 + else if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId())
360 330 {
361   - if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId())
362   - {
363   - if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() )
364   - {
365   - sendList.add(temp);
366   - break;
367   - }
368   - }
  331 + sendList.add(temp);
369 332 }
  333 + }
370 334  
371 335  
372   -
373   - for (SmsTemplateModel temp : temps)
374   - {
375   - if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId())
376   - {
377   - sendList.add(temp);
378   - break;
379   - }
380   - }
  336 +// for (SmsTemplateModel temp : temps)
  337 +// {
  338 +// if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus)
  339 +// {
  340 +// sendList.add(temp);
  341 +// break;
  342 +// }
  343 +// }
  344 +//
  345 +// for (SmsTemplateModel temp : temps)
  346 +// {
  347 +// if (temp.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId())
  348 +// {
  349 +// if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() )
  350 +// {
  351 +// sendList.add(temp);
  352 +// break;
  353 +// }
  354 +// }
  355 +// }
  356 +//
  357 +// for (SmsTemplateModel temp : temps)
  358 +// {
  359 +// if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId())
  360 +// {
  361 +// if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId()
  362 +// || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()|| serviceStatus == ServiceStatusEnums.SUSPEND.getId())
  363 +// {
  364 +// sendList.add(temp);
  365 +// break;
  366 +// }
  367 +// }
  368 +// }
  369 +//
  370 +//
  371 +// for (SmsTemplateModel temp : temps)
  372 +// {
  373 +// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId())
  374 +// {
  375 +// if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() )
  376 +// {
  377 +// sendList.add(temp);
  378 +// break;
  379 +// }
  380 +// }
  381 +// }
  382 +//
  383 +//
  384 +//
  385 +// for (SmsTemplateModel temp : temps)
  386 +// {
  387 +// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId())
  388 +// {
  389 +// if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() )
  390 +// {
  391 +// sendList.add(temp);
  392 +// break;
  393 +// }
  394 +// }
  395 +// }
  396 +//
  397 +//
  398 +//
  399 +// for (SmsTemplateModel temp : temps)
  400 +// {
  401 +// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId())
  402 +// {
  403 +// if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() )
  404 +// {
  405 +// sendList.add(temp);
  406 +// break;
  407 +// }
  408 +// }
  409 +// }
  410 +//
  411 +//
  412 +//
  413 +// for (SmsTemplateModel temp : temps)
  414 +// {
  415 +// if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId())
  416 +// {
  417 +// sendList.add(temp);
  418 +// break;
  419 +// }
  420 +// }
381 421  
382 422 if (CollectionUtils.isNotEmpty(sendList))
383 423 {