From 41f99a843fb2c0424426e006f29c1e78192eae01 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期三, 06 十二月 2023 08:37:55 +0800 Subject: [PATCH] zjh 2023/12/06--1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 39 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 38 insertions(+), 1 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 e485e43..250602e 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 @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.text.SimpleDateFormat; +import java.time.OffsetTime; import java.util.*; import java.util.List; import java.util.stream.Collectors; @@ -29,6 +30,7 @@ import com.ltkj.hosp.domain.*; import com.ltkj.hosp.service.*; import com.ltkj.hosp.vodomain.BingZhongVO; +import com.ltkj.hosp.vodomain.HistoryTjOrder; import com.ltkj.hosp.vodomain.QjDomainVo; import com.ltkj.mall.domain.MallCheckLog; import com.ltkj.mall.domain.MallOrder; @@ -64,7 +66,7 @@ */ @RestController @RequestMapping("/hosp/order") -@Api(tags = "浣撴璁板綍鎺ュ彛") +@Api(tags = "PC绔� ----浣撴璁板綍鎺ュ彛") @Slf4j public class TjOrderController extends BaseController { @Resource @@ -1643,4 +1645,39 @@ } return AjaxResult.success("鏍告敹鎴愬姛"); } + + @GetMapping("/getHistryTjOrderByCusIdCard") + @ApiOperation(value = "鏍规嵁韬唤璇佸彿鏌ョ湅鍘嗗彶浣撴璁板綍") + @Transactional + public AjaxResult getHistryTjOrderByCusIdCard(@RequestParam String cusIdCard) { + TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdCard); + List<HistoryTjOrder> list=new ArrayList<>(); + if(null !=tjCustomer){ + List<TjOrder> orderList = tjOrderService.getTjOrderListByCusId(tjCustomer.getCusId()); + for (TjOrder order : orderList) { + HistoryTjOrder historyTjOrder=new HistoryTjOrder(); + historyTjOrder.setUserName(tjCustomer.getCusName()); + historyTjOrder.setTjNum(order.getTjNumber()); + historyTjOrder.setTjTime(order.getCreateTime()); + historyTjOrder.setTjProName(tjOrderService.getHistoryTjOrderProByTjNum(order.getTjNumber())); + list.add(historyTjOrder); + } + } + return AjaxResult.success(list); + } + + + @GetMapping("/getHistryTjOrderProByCusIdCard") + @ApiOperation(value = "鏍规嵁韬唤璇佸彿鏌ョ湅鍘嗗彶浣撴椤圭洰璁板綍") + @Transactional + public AjaxResult getHistryTjOrderProByCusIdCard(@RequestParam String cusIdCard) { + TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdCard); + if(null !=tjCustomer){ + TjOrder order= tjOrderService.getLastTjOrderListByCusId(tjCustomer.getCusId()); + + return AjaxResult.success(order); + } + return AjaxResult.success("鏆傛棤鍘嗗彶璁板綍"); + } + } -- Gitblit v1.8.0