修改bug

gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateOverviewApiServiceImpl.java

@@ -131,6 +131,7 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
                         return storeId == null ? null : Integer.valueOf(storeId.toString());
                     }
             ).collect(Collectors.toList());
+            // todo 这里要取数据组的数据
             Map<Integer, Map<String, Object>> orderCountMap = evaluateMsgLogService.orderCountByStoreId(storeTrendQO.getEnterpriseId(), storeIdList);
             for (Map<String, Object> e : trendList) {
                 // e.put("evaluateRate", 0);

gic-evaluate-web/src/main/java/com/gic/evaluate/web/controller/EvaluateOverviewController.java

@@ -13,6 +13,7 @@ import com.gic.evaluate.qo.StoreTrendQO;
 import com.gic.evaluate.service.EvaluateOverviewApiService;
 import com.gic.store.service.StoreWidgetApiService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -53,6 +54,12 @@ public class EvaluateOverviewController {
             ServiceResponse<List<Integer>> serviceResponse = storeWidgetApiService.listStoreIdByStoreWidgetId(UserDetailUtils.getUserDetail().getEnterpriseId(), storeWidgetId);
             storeIdList = serviceResponse.getResult();
         }
+        if (StringUtils.isNotBlank(startTime)) {
+            startTime += " 00:00:00";
+        }
+        if (StringUtils.isNotBlank(endTime)) {
+            endTime += " 23:59:59";
+        }
         ServiceResponse<Map<String, Long>> serviceResponse = evaluateOverviewApiService.chart1(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
@@ -73,6 +80,12 @@ public class EvaluateOverviewController {
             ServiceResponse<List<Integer>> serviceResponse = storeWidgetApiService.listStoreIdByStoreWidgetId(UserDetailUtils.getUserDetail().getEnterpriseId(), storeWidgetId);
             storeIdList = serviceResponse.getResult();
         }
+        if (StringUtils.isNotBlank(startTime)) {
+            startTime += " 00:00:00";
+        }
+        if (StringUtils.isNotBlank(endTime)) {
+            endTime += " 23:59:59";
+        }
         ServiceResponse<HashMap<String, Map<String, Long>>> serviceResponse = evaluateOverviewApiService.chart2(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
@@ -93,6 +106,12 @@ public class EvaluateOverviewController {
             ServiceResponse<List<Integer>> serviceResponse = storeWidgetApiService.listStoreIdByStoreWidgetId(UserDetailUtils.getUserDetail().getEnterpriseId(), storeWidgetId);
             storeIdList = serviceResponse.getResult();
         }
+        if (StringUtils.isNotBlank(startTime)) {
+            startTime += " 00:00:00";
+        }
+        if (StringUtils.isNotBlank(endTime)) {
+            endTime += " 23:59:59";
+        }
         ServiceResponse<Map<String, List<Map<String, Object>>>> serviceResponse = evaluateOverviewApiService.chart3(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
@@ -113,6 +132,12 @@ public class EvaluateOverviewController {
             ServiceResponse<List<Integer>> serviceResponse = storeWidgetApiService.listStoreIdByStoreWidgetId(UserDetailUtils.getUserDetail().getEnterpriseId(), storeWidgetId);
             storeIdList = serviceResponse.getResult();
         }
+        if (StringUtils.isNotBlank(startTime)) {
+            startTime += " 00:00:00";
+        }
+        if (StringUtils.isNotBlank(endTime)) {
+            endTime += " 23:59:59";
+        }
         ServiceResponse<Map<String, List<Map<String, Object>>>> serviceResponse = evaluateOverviewApiService.chart4(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
@@ -130,6 +155,12 @@ public class EvaluateOverviewController {
             }
         }
 
+        if (StringUtils.isNotBlank(storeScoreQO.getStartTime())) {
+            storeScoreQO.setStartTime(storeScoreQO.getStartTime() + " 00:00:00");
+        }
+        if (StringUtils.isNotBlank(storeScoreQO.getEndTime())) {
+            storeScoreQO.setEndTime(storeScoreQO.getEndTime() + " 23:59:59");
+        }
         ServiceResponse<Page<Map<String, Object>>> serviceResponse = evaluateOverviewApiService.listStoreScore(storeScoreQO);
 //        ServiceResponse<Map<String, Object>> totalStoreScore = evaluateOverviewApiService.getTotalStoreScore(storeScoreQO);
 //        List<Map<String, Object>> result = serviceResponse.getResult().getResult();
@@ -189,6 +220,12 @@ public class EvaluateOverviewController {
             ServiceResponse<List<Integer>> serviceResponse = storeWidgetApiService.listStoreIdByStoreWidgetId(UserDetailUtils.getUserDetail().getEnterpriseId(), storeWidgetId);
             storeIdList = serviceResponse.getResult();
         }
+        if (StringUtils.isNotBlank(startTime)) {
+            startTime += " 00:00:00";
+        }
+        if (StringUtils.isNotBlank(endTime)) {
+            endTime += " 23:59:59";
+        }
         ServiceResponse<List<Map<String, Integer>>> serviceResponse = evaluateOverviewApiService.listBadEvaluateTrendByDate(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
         return ResultControllerUtils.commonResult(serviceResponse);
     }