From 39e13040b73d4a7b65c4803f1642de8a38bab613 Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Wed, 23 Aug 2023 20:48:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E5=8D=95=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/controller/CustomMadeInfoController.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springblade/modules/desk/controller/CustomMadeInfoController.java b/src/main/java/org/springblade/modules/desk/controller/CustomMadeInfoController.java index bab3d16..d9ee2d2 100644 --- a/src/main/java/org/springblade/modules/desk/controller/CustomMadeInfoController.java +++ b/src/main/java/org/springblade/modules/desk/controller/CustomMadeInfoController.java @@ -107,12 +107,15 @@ public class CustomMadeInfoController extends BladeController { * 分页 */ @GetMapping("/list") - public R> list(Query query, String orderNo, String username, String phone, String pillowMaterial, + public R> list(Query query, String orderNo, String purchaseChannel, String username, String phone, String pillowMaterial, String pillowHardness, String ageRange, String startTime, String endTime) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); if (Func.isNotEmpty(orderNo)) { wrapper.like(CustomMadeInfo::getOrderNo, orderNo); } + if (Func.isNotEmpty(purchaseChannel)) { + wrapper.like(CustomMadeInfo::getPurchaseChannel, purchaseChannel); + } if (Func.isNotEmpty(username)) { wrapper.like(CustomMadeInfo::getUsername, username); } @@ -143,12 +146,15 @@ public class CustomMadeInfoController extends BladeController { * 导出 */ @GetMapping("/export") - public void export(HttpServletResponse response, String orderNo, String username, String phone, String pillowMaterial, + public void export(HttpServletResponse response, String orderNo, String purchaseChannel, String username, String phone, String pillowMaterial, String pillowHardness, String ageRange, String startTime, String endTime) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); if (Func.isNotEmpty(orderNo)) { wrapper.like(CustomMadeInfo::getOrderNo, orderNo); } + if (Func.isNotEmpty(purchaseChannel)) { + wrapper.like(CustomMadeInfo::getPurchaseChannel, purchaseChannel); + } if (Func.isNotEmpty(username)) { wrapper.like(CustomMadeInfo::getUsername, username); } @@ -198,7 +204,7 @@ public class CustomMadeInfoController extends BladeController { int total = Func.toInt(iCustomMadeInfoService.count(wrapper)); info.setOrderNoSort(total + 1); } - return R.status(iCustomMadeInfoService.save(info)); + return R.status(iCustomMadeInfoService.saveOrUpdate(info)); } /**