Commit 53cba37f by zhiwj

pmd

parent 85aefc3f
......@@ -29,7 +29,7 @@ public interface EvaluateOverviewApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.util.Map<java.lang.String,java.lang.Long>>
* @throws
*/
ServiceResponse<Map<String, Long>> chart1(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
ServiceResponse<Map<String, Long>> chartOne(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
/**
* 图表2 各项评分概况
......@@ -39,7 +39,7 @@ public interface EvaluateOverviewApiService {
* @param storeIdList
* @return
*/
ServiceResponse<HashMap<String, Map<String, Long>>> chart2(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
ServiceResponse<HashMap<String, Map<String, Long>>> chartTwo(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
/**
* 图表3 评价趋势
......@@ -53,7 +53,7 @@ public interface EvaluateOverviewApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.util.Map<java.lang.String,java.util.List<java.util.Map<java.lang.String,java.lang.Object>>>>
* @throws
*/
ServiceResponse<Map<String, List<Map<String, Object>>>> chart3(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
ServiceResponse<Map<String, List<Map<String, Object>>>> chartThree(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
/**
* 图表4 正面/负面快评使用统计 变化趋势
......@@ -67,7 +67,7 @@ public interface EvaluateOverviewApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.util.Map<java.lang.String,java.util.List<java.util.Map<java.lang.String,java.lang.Object>>>>
* @throws
*/
ServiceResponse<Map<String, List<Map<String, Object>>>> chart4(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
ServiceResponse<Map<String, List<Map<String, Object>>>> chartFour(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
/**
* 查询门店评分
......
......@@ -39,7 +39,7 @@ public class EvaluateOverviewController {
private ResourceApiService resourceApiService;
@RequestMapping("/evaluate-chart1")
public RestResponse evaluateChart1(String startTime, String endTime, Integer storeWidgetId) {
public RestResponse evaluateChartOne(String startTime, String endTime, Integer storeWidgetId) {
List<Integer> storeIdList = Collections.emptyList();
// 权限判断
// 判断权限
......@@ -62,12 +62,12 @@ public class EvaluateOverviewController {
if (StringUtils.isNotBlank(endTime)) {
endTime += " 23:59:59";
}
ServiceResponse<Map<String, Long>> serviceResponse = evaluateOverviewApiService.chart1(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
ServiceResponse<Map<String, Long>> serviceResponse = evaluateOverviewApiService.chartOne(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
return ResultControllerUtils.commonResult(serviceResponse);
}
@RequestMapping("/evaluate-chart2")
public RestResponse evaluateChart2(String startTime, String endTime, Integer storeWidgetId) {
public RestResponse evaluateChartTwo(String startTime, String endTime, Integer storeWidgetId) {
List<Integer> storeIdList = Collections.emptyList();
// 判断权限
OrderResourceDTO orderResourceDTO = resourceApiService.getOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
......@@ -89,12 +89,12 @@ public class EvaluateOverviewController {
if (StringUtils.isNotBlank(endTime)) {
endTime += " 23:59:59";
}
ServiceResponse<HashMap<String, Map<String, Long>>> serviceResponse = evaluateOverviewApiService.chart2(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
ServiceResponse<HashMap<String, Map<String, Long>>> serviceResponse = evaluateOverviewApiService.chartTwo(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
return ResultControllerUtils.commonResult(serviceResponse);
}
@RequestMapping("/evaluate-chart3")
public RestResponse evaluateChart3(String startTime, String endTime, Integer storeWidgetId) {
public RestResponse evaluateChartThree(String startTime, String endTime, Integer storeWidgetId) {
List<Integer> storeIdList = Collections.emptyList();
// 权限判断
OrderResourceDTO orderResourceDTO = resourceApiService.getOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
......@@ -115,12 +115,12 @@ public class EvaluateOverviewController {
if (StringUtils.isNotBlank(endTime)) {
endTime += " 23:59:59";
}
ServiceResponse<Map<String, List<Map<String, Object>>>> serviceResponse = evaluateOverviewApiService.chart3(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
ServiceResponse<Map<String, List<Map<String, Object>>>> serviceResponse = evaluateOverviewApiService.chartThree(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
return ResultControllerUtils.commonResult(serviceResponse);
}
@RequestMapping("/evaluate-chart4")
public RestResponse evaluateChart4(String startTime, String endTime, Integer storeWidgetId) {
public RestResponse evaluateChartFour(String startTime, String endTime, Integer storeWidgetId) {
List<Integer> storeIdList = Collections.emptyList();
// 权限判断
OrderResourceDTO orderResourceDTO = resourceApiService.getOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
......@@ -142,7 +142,7 @@ public class EvaluateOverviewController {
if (StringUtils.isNotBlank(endTime)) {
endTime += " 23:59:59";
}
ServiceResponse<Map<String, List<Map<String, Object>>>> serviceResponse = evaluateOverviewApiService.chart4(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
ServiceResponse<Map<String, List<Map<String, Object>>>> serviceResponse = evaluateOverviewApiService.chartFour(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
return ResultControllerUtils.commonResult(serviceResponse);
}
......
......@@ -63,9 +63,9 @@ public class ExcelUtils {
for (int j = 0; j < everyLines.get(i).size(); j++) {
sheet.setColumnWidth(j, COLUMN_HEIGHT);
//将内容按顺序赋给对应的列对象
XSSFCell cell1 = row.createCell(j);
cell1.setCellValue(everyLines.get(i).get(j));
cell1.setCellStyle(style);
XSSFCell cellTmp = row.createCell(j);
cellTmp.setCellValue(everyLines.get(i).get(j));
cellTmp.setCellStyle(style);
}
}
return wb;
......@@ -79,9 +79,9 @@ public class ExcelUtils {
XSSFRow row1 = sheet.createRow(0);
row1.setZeroHeight(true);
XSSFCell cell1 = row1.createCell(0);
XSSFCell cellOne = row1.createCell(0);
if (StringUtils.isNotBlank(regionIdStr)) {
cell1.setCellValue(regionIdStr);
cellOne.setCellValue(regionIdStr);
}
XSSFRow rowm = sheet.createRow(1); // 产生表格标题行
......
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