Commit d77942f4 by zhiwj

修改bug

parent 31dc7c84
......@@ -11,7 +11,6 @@ import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.evaluate.constant.QuickReplyTypeEnum;
import com.gic.evaluate.qo.StoreScoreQO;
import com.gic.evaluate.qo.StoreTrendQO;
import com.gic.evaluate.service.EvaluateMsgLogService;
import com.gic.evaluate.service.EvaluateOverviewApiService;
import com.gic.evaluate.service.EvaluateQuickService;
import com.gic.evaluate.service.EvaluateService;
......@@ -40,8 +39,8 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
@Autowired
private EvaluateService evaluateService;
@Autowired
private EvaluateMsgLogService evaluateMsgLogService;
// @Autowired
// private EvaluateMsgLogService evaluateMsgLogService;
@Autowired
private EvaluateQuickService evaluateQuickService;
@Autowired
......@@ -72,7 +71,7 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
public ServiceResponse<Map<String, List<Map<String, Object>>>> chart3(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
List<Map<String, Object>> listTrendTotalEvaluate = this.evaluateService.listTrendTotalEvaluate(enterpriseId, startTime, endTime, storeIdList);
List<Map<String, Object>> listTrendGoodEvaluate = this.evaluateService.listTrendGoodEvaluate(enterpriseId, startTime, endTime, storeIdList);
List<Map<String, Object>> listTrendOrderCount = evaluateMsgLogService.listTrendOrderCount(enterpriseId, startTime, endTime, storeIdList);
List<Map<String, Object>> listTrendOrderCount = this.storeEvaluateApiService.listTrendOrderCount(enterpriseId, startTime, endTime, storeIdList).getResult();
Map<String, List<Map<String, Object>>> map = new HashMap<>();
......@@ -141,7 +140,7 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
return storeId == null ? null : Integer.valueOf(storeId.toString());
}
).collect(Collectors.toList());
// todo 这里要取数据组的数据
// 这里要取数据组的数据
Map<Integer, StoreOrderEvaluateDTO> orderCountMap = storeEvaluateApiService.getStoreOrderEvaluateByStoreId(storeTrendQO.getEnterpriseId(), storeIdList).getResult();
// Map<Integer, Map<String, Object>> orderCountMap = evaluateMsgLogService.orderCountByStoreId(storeTrendQO.getEnterpriseId(), storeIdList);
for (Map<String, Object> e : trendList) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment