From c219f11b51903d5aeb4c7ca261df593597aa7fe2 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 16 四月 2024 17:59:54 +0800 Subject: [PATCH] 人员明细+报告编制的提交审核批准+能力范围的下拉数据字典 --- inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 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 9aa8e09..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; @@ -79,8 +80,8 @@ @ApiOperation(value = "瀹℃牳妫�楠屽崟杩涜鐘舵�佷慨鏀�") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "妫�楠屽崟id"), - @ApiImplicitParam(name = "state", value = "瀹℃牳缁撴灉 1:閫氳繃 2锛氫笉閫氳繃") + @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class), + @ApiImplicitParam(name = "state", value = "瀹℃牳缁撴灉 1:閫氳繃 2锛氫笉閫氳繃", dataTypeClass = Integer.class) }) @PostMapping("/upInsOrderOfState") public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) { @@ -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