From f6b439c8958e7e0520057404b7226c7507f5d1a1 Mon Sep 17 00:00:00 2001 From: 李林 <z1292839451@163.com> Date: 星期四, 11 四月 2024 18:01:23 +0800 Subject: [PATCH] 报告生成功能:支持数据填充,发现单元格合并bug,发现模板重复 --- inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java index 0598af8..3f32791 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.annotation.ValueAuth; +import com.yuanchu.mom.dto.CostStatisticsDto; import com.yuanchu.mom.dto.SampleOrderDto; import com.yuanchu.mom.dto.SampleProductDto; import com.yuanchu.mom.dto.SampleProductDto2; @@ -123,4 +124,12 @@ return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto)); } + @ApiOperation(value = "璐圭敤缁熻") + @PostMapping("/costStatistics") + public Result<?> costStatistics(@RequestBody Map<String, Object> data) throws Exception { + Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class); + CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class); + return Result.success(insOrderService.costStatistics(page, costStatisticsDto)); + } + } -- Gitblit v1.9.3