From 40c75db6d335a0335e944e5196a102d8837cad6b Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期一, 15 七月 2024 21:00:28 +0800 Subject: [PATCH] 工时bug修改+光纤接头损耗报告完成 --- inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 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 361b748..0af2a5a 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 @@ -80,7 +80,7 @@ @ValueAuth public Result<?> selectOrderManDay(Integer id) { int day = insProductService.selectOrderManDay(id); - return Result.success("鎴愬姛", LocalDateTime.now().plusDays(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + return Result.success("鎴愬姛", LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); } @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�") @@ -142,6 +142,15 @@ CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class); return Result.success(insOrderService.costStatistics(page, costStatisticsDto)); } + + @ValueAuth + @ApiOperation(value = "璐圭敤缁熻鑾峰彇鎬讳环") + @PostMapping("/costStatistics2") + public Result<?> costStatistics2(@RequestBody Map<String, Object> data) throws Exception { + CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class); + return Result.success(insOrderService.costStatistics2(costStatisticsDto)); + } + @ValueClassify("缁熻鍥捐〃") @ApiOperation(value = "鏍峰搧缂洪櫡鎸囨暟") @PostMapping("/selectSampleDefects") -- Gitblit v1.9.3