Merge branch 'master' of http://dev.xinyingpower.com:8080/git/xymp/backend

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java

@@ -491,7 +491,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
     public ServiceBody<TerminalScheduleRuleTimeListModel> getCmaSchelduleDetials(RequestIdVo vo) {
         TerminalScheduleRuleTimeListModel model = new TerminalScheduleRuleTimeListModel();
         RequestResults results = requestResultsDao.selectByRequestId(vo.getRequestid());
-        if(null!=results){
+        if(null!=results) {
             String resultsData = results.getData();
             if (StringUtils.isNotBlank(resultsData)) {
                 JSONObject resultObj = JSONObject.parseObject(resultsData);
@@ -501,7 +501,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
                         int group = Integer.parseInt(resultObj.get("group").toString());
                         int toIndex = 3;
                         List<String> resultList = Lists.newArrayList();
-                    for(int i = 0;i<(group/toIndex);i++) {
+                        for (int i = 0; i < (group / toIndex); i++) {
                             List<PhotoTimeResultDto> newList = resultDtoList.subList(i, i + toIndex);
                             for (int i1 = 0; i1 < newList.size(); i1++) {
                                 String startTimeStr = resultDtoList.get(2).getHour() + ":" + resultDtoList.get(2).getMinute() + ":00";
@@ -522,10 +522,8 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
                     }
                 }
             }
-            return Asserts.success(model);
-        } else {
-            return Asserts.error("查询失败");
         }
+            return Asserts.success(model);
     }
 
 }