From 52d79c7e5a1fb4316f34886ec336f69f56d5edb2 Mon Sep 17 00:00:00 2001 From: lxp <1928192722@qq.com> Date: 星期六, 15 三月 2025 10:48:46 +0800 Subject: [PATCH] 工时管理日工时管理以及辅助工时配置 --- inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java index 44a6ab4..44f0efd 100644 --- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java @@ -307,9 +307,7 @@ @ApiOperation(value = "鏌ョ湅璐圭敤缁熻鍒楄〃") @GetMapping("/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); + public Result<?> costStatistics(Page page,CostStatisticsDto costStatisticsDto) throws Exception { return Result.success(insOrderService.costStatistics(page, costStatisticsDto)); } @@ -326,4 +324,4 @@ public Result permute(Integer num, Boolean isValue) { return Result.success(insOrderService.permute(num,isValue)); } -} \ No newline at end of file +} -- Gitblit v1.9.3