From a1d14d38b0e7ad851afa0691a6774ab4780aeef7 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 8 Sep 2016 10:01:21 +0800 Subject: [PATCH] code update --- .../operate/web/facade/BookbuildingFacade.java | 156 +++++++++++++-------- 1 file changed, 98 insertions(+), 58 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index ac5da43..cea3d0d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -293,91 +293,131 @@ public class BookbuildingFacade { List temps = smsTemplateService.querySmsTemplates(query); if (CollectionUtils.isNotEmpty(temps)) { + for (SmsTemplateModel temp : temps) { if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) { sendList.add(temp); - break; } - } - - for (SmsTemplateModel temp : temps) - { - if (temp.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId()) + else if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) { - if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() ) - { - sendList.add(temp); - break; - } + sendList.add(temp); } - } - - for (SmsTemplateModel temp : temps) - { - if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId()) + else if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId()) { if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()|| serviceStatus == ServiceStatusEnums.SUSPEND.getId()) { sendList.add(temp); - break; } } - } - - - for (SmsTemplateModel temp : temps) + else if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId()) { - if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId()) + if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() ) { - if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() ) - { - sendList.add(temp); - break; - } + sendList.add(temp); } } - - - - for (SmsTemplateModel temp : temps) + else if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId()) { - if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId()) + if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() ) { - if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() ) - { - sendList.add(temp); - break; - } + sendList.add(temp); } } - - - - for (SmsTemplateModel temp : temps) + else if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) { - if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId()) - { - if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() ) - { - sendList.add(temp); - break; - } - } + sendList.add(temp); } + } - - for (SmsTemplateModel temp : temps) - { - if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) - { - sendList.add(temp); - break; - } - } +// for (SmsTemplateModel temp : temps) +// { +// if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) +// { +// sendList.add(temp); +// break; +// } +// } +// +// for (SmsTemplateModel temp : temps) +// { +// if (temp.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId()) +// { +// if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() ) +// { +// sendList.add(temp); +// break; +// } +// } +// } +// +// for (SmsTemplateModel temp : temps) +// { +// if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId()) +// { +// if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() +// || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()|| serviceStatus == ServiceStatusEnums.SUSPEND.getId()) +// { +// sendList.add(temp); +// break; +// } +// } +// } +// +// +// for (SmsTemplateModel temp : temps) +// { +// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId()) +// { +// if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() ) +// { +// sendList.add(temp); +// break; +// } +// } +// } +// +// +// +// for (SmsTemplateModel temp : temps) +// { +// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId()) +// { +// if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() ) +// { +// sendList.add(temp); +// break; +// } +// } +// } +// +// +// +// for (SmsTemplateModel temp : temps) +// { +// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId()) +// { +// if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() ) +// { +// sendList.add(temp); +// break; +// } +// } +// } +// +// +// +// for (SmsTemplateModel temp : temps) +// { +// if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) +// { +// sendList.add(temp); +// break; +// } +// } if (CollectionUtils.isNotEmpty(sendList)) { -- 1.8.3.1