|
|
@@ -209,7 +209,6 @@ public class SalesForecastSummaryController {
|
|
|
|
|
|
@PostMapping("/importForecastData/{id}")
|
|
|
@ApiOperation(value = "导入销售预测数据(覆盖同年同月数据)")
|
|
|
- @Transactional
|
|
|
public R<List<PcBladeSalesForecastSummary>> importForecastData(@PathVariable("id") Long id, @RequestParam("file") MultipartFile file) {
|
|
|
|
|
|
if (id == null) {
|
|
|
@@ -332,16 +331,11 @@ public class SalesForecastSummaryController {
|
|
|
forecastService.saveBatch(saveList);
|
|
|
}
|
|
|
|
|
|
- PcBladeSalesForecastSummary pcBladeSalesForecastSummary = new PcBladeSalesForecastSummary();
|
|
|
- pcBladeSalesForecastSummary.setForecastMainId(id);
|
|
|
QueryWrapper<PcBladeSalesForecastSummary> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq("forecast_main_id", id);
|
|
|
|
|
|
List<PcBladeSalesForecastSummary> lists = forecastService.list(queryWrapper);
|
|
|
-
|
|
|
return R.data(lists);
|
|
|
-// return R.success(String.format("数据导入成功,共导入%s条有效数据,已覆盖当月原有数据", saveList.size()));
|
|
|
-
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
return R.fail("导入失败:" + e.getMessage());
|