From 5c92f5ec07c74272c7bfd658ef9c9f5ceb02cfb1 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期六, 15 三月 2025 17:00:16 +0800
Subject: [PATCH] 统计图表、任务展示代码搬迁
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 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 074496d..f58154e 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
@@ -73,26 +73,23 @@
@ApiOperation(value = "涓嬪崟鎸夐挳")
@PostMapping("/addInsOrder")
@Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.INSERT)
- public Result<?> addInsOrder(String str) {
- Map<String, Object> map = JSON.parseObject(str, Map.class);
- JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
- List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
- InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
- List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+"");
- List<List<Integer>> fiberPairing = JSON.parseArray(map.get("fiberPairing")+"");//鍏夌氦閰嶇疆閲岀殑鐔旀帴閰嶅
- return Result.success(insOrderService.addInsOrder(list, insOrder, pairing,fiberPairing));
+ public Result<?> addInsOrder(@RequestBody AddInsOrderDTO addInsOrderDTO) {
+ return Result.success(insOrderService.addInsOrder(
+ addInsOrderDTO.getList(),
+ addInsOrderDTO.getInsOrder(),
+ addInsOrderDTO.getPairing(),
+ addInsOrderDTO.getFiberPairing()));
}
@ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
@GetMapping("/selectOrderManDay")
public Result<?> selectOrderManDay(Integer id) {
int day = insProductService.selectOrderManDay(id);
- return Result.success("鎴愬姛", LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ return Result.success(LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),"鎴愬姛");
}
@ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
@GetMapping("/getInsOrder")
- @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.OTHER)
public Result<?> getInsOrder(Integer orderId) {
return Result.success(insOrderService.getInsOrder(orderId));
}
@@ -154,8 +151,7 @@
@ApiOperation(value = "璐圭敤缁熻鑾峰彇鎬讳环")
@GetMapping("/costStatistics2")
- public Result<?> costStatistics2(@RequestBody Map<String, Object> data) throws Exception {
- CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
+ public Result<?> costStatistics2( CostStatisticsDto costStatisticsDto) throws Exception {
return Result.success(insOrderService.costStatistics2(costStatisticsDto));
}
@@ -310,9 +306,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));
}
@@ -329,4 +323,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