Commit 902d05df by peterchu

fix:

1.优化业务代码
2.重写转换销售明细记录方法
3.修改销售明细报表查询相关业务逻辑方法
parent 4b2d4dc5
......@@ -62,7 +62,7 @@ public class DownLoadController {
}
/**
* 下载销售报表(符合查询条件时,直接从数据库SaleDetail表中直接下载获取报表数据)
* 快速导出报表(新)
* 快速导出报表(新)20210324
* @param requestBody
* @return
*/
......
......@@ -28,6 +28,7 @@ public class StatementController {
/**
* 销售明细报表页面 获取销售明细数据
* 20210915093650
* @param requestBody
* @return
*/
......@@ -38,7 +39,7 @@ public class StatementController {
/**
* 下载销售报表(符合查询条件时,直接从数据库SaleDetail表中直接下载获取报表数据)
* 销售明细报表 导出报表(新)
* 销售明细报表 导出报表(新)20210324
* @param requestBody
* @return
*/
......@@ -48,7 +49,8 @@ public class StatementController {
if (noteResult.getStatus() != 200 ){
response.setStatus(204);
}
return saleDetailService.downloadSalesDetailReportExcel(requestBody, response);
// return saleDetailService.downloadSalesDetailReportExcel(requestBody, response);
return noteResult;
}
/**
......
......@@ -676,7 +676,8 @@ public class DownLoadService {
List<SaleDetail> saleDetailList = new ArrayList<>();
try {
//解析主逻辑
saleDetailList = parseToSaleDetail.parseToSaleDetailMain(params, key);
// saleDetailList = parseToSaleDetail.parseToSaleDetailMain(params, key);
saleDetailList = parseToSaleDetail.parseToSaleDetails(params, key); // 20210914194247 按乘机人记录销售明细记录
} catch (Exception e) {
logger.error("[自动报表] 解析Map到SaleDetail List 出现异常", e);
}
......@@ -685,7 +686,7 @@ public class DownLoadService {
}
/**
* 快速导出报表(新)
* 快速导出报表(新)20210324
*
* @param requestBody
* @return
......
......@@ -103,6 +103,7 @@ public class SaleDetailService implements CommandLineRunner {
/**
* 获取销售明细报表数据,并将其处理为 Excel
* 20210915094612
* @param requestBody
* @param response
* @return
......
......@@ -7,8 +7,9 @@ spring:
polestarLogsServicesUrl: 'http://127.0.0.1:8089/'
dataApiUrl: 'http://14.18.207.91:38071/iffs-data-api/'
# 订单服务 ordercenter 中销售明细报表统计接口
# statementApiUrl: 'http://121.36.16.56:32480/ordercenterApi/'
statementApiUrl: 'http://121.36.31.103:32480/ordercenterApi/'
statementApiUrl: 'http://127.0.0.1:8091/ordercenterApi/'
# statementApiUrl: 'http://121.36.16.56:32480/ordercenterApi/'
# statementApiUrl: 'http://121.36.31.103:32480/ordercenterApi/'
pathConfig:
saleDetailReportExcelPath: 'D:\\polestar_ExcelFile/' # 销售明细报表导出保存的本地路径
saleReportExcelPath: 'D:/polestar_ExcelFile/' #
......
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