From b6a095a76848ffd15922cc4af7f14594fc5bf85d Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期五, 08 十一月 2024 11:16:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs --- src/main/java/com/zy/asrs/controller/OrderDetlController.java | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java index 6e35693..86b40f3 100644 --- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java +++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java @@ -9,13 +9,14 @@ import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.R; -import com.zy.asrs.entity.Order; import com.zy.asrs.entity.OrderDetl; +import com.zy.asrs.mapper.OrderDetlMapper; import com.zy.asrs.service.OrderDetlService; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -26,6 +27,9 @@ @Autowired private OrderDetlService orderDetlService; + + @Resource + private OrderDetlMapper orderDetlMapper; @PostMapping("/orderDetl/list/pda/auth") public R getPdaOrderDetl(@RequestBody Map<String,Object> map) { @@ -142,4 +146,13 @@ return R.ok(); } + @RequestMapping(value = "/orderDetl/getPrintDetl/{id}") + @ManagerAuth + public R getPrintDetl(@PathVariable("id") Integer id) { + if (Cools.isEmpty(id)) { + return R.parse("id涓虹┖"); + } + return R.ok(orderDetlMapper.selectPrintData(id)); + } + } -- Gitblit v1.9.1