From 4761f2bc70814bde9929f1081a213a9ab38a7393 Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期四, 02 一月 2025 18:15:38 +0800 Subject: [PATCH] 采样管理确认采样增加调用lis请求 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java index bfb5fb4..bf2c9e8 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java @@ -2592,9 +2592,9 @@ @ApiOperation(value = "鏍规嵁浣撴鍙疯幏鍙栨眹鎬诲拰鏄庣粏鐨勬暟鎹�") public AjaxResult getTransitionInfo(@RequestParam("tjNumber") String tjNumber) { QueryWrapper<TbTransition> wrapper = new QueryWrapper<>(); - wrapper.select("parent_pro_id", "parent_pro_name", "sum(ord_price) as ord_price") + wrapper.select("parent_pro_id", "parent_pro_name", "sum(now_price) as ord_price") .eq("tj_num", tjNumber) - .groupBy("parent_pro_name"); + .groupBy("parent_pro_id"); List<TbTransition> list = transitionService.list(wrapper); List<Long> parentProIds = list.stream().map(item -> item.getParentProId()).collect(Collectors.toList()); LambdaQueryWrapper<TjProject> projectQueryWrapper = new LambdaQueryWrapper<>(); @@ -3721,5 +3721,13 @@ } + @GetMapping(value = "newgetTransitionList") + @ApiOperation(value = "鏈�鏂版煡璇㈣繃娓¤〃鏁版嵁") + public AjaxResult newgetTransitionList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId) { + List<TbTransition> list= transitionService.newgetTransitionList(cusId); + return AjaxResult.success(list); + } + + } -- Gitblit v1.8.0