From ae24e4ebf5b58c6f8824a06a2eaf0c757715c457 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 8 Jan 2025 14:29:40 +0800 Subject: [PATCH] =?UTF-8?q?1/8=20=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/collect/IoCollectCodeBackupController.java | 6 ++++++ .../glxp/api/service/collect/IoCollectCodeBackService.java | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java index db6484898..f29173fd6 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java @@ -128,6 +128,10 @@ public class IoCollectCodeBackupController extends BaseController { @GetMapping("/udiwms/basic/collect/ioCollectCode/endList") public BaseResponse filterList(IoCollectCodeRequest request) { IoCollectOrderBackup order = ioCollectOrderBackupService.getByBillNo(request.getBillNo()); + if(request.getSelectType() == null){ + //如果是null 正常查询 + request.setSelectType(1); + } if (order.getCheckCodeStatus() != 1 && request.getSelectType() == 2){ List list = ioCollectOrderCheckCodeService.list(new LambdaQueryWrapper().eq(IoCollectOrderCheckCode::getBillNo, request.getBillNo())); if (list.size() > 0){ @@ -148,6 +152,8 @@ public class IoCollectCodeBackupController extends BaseController { // 调用服务层方法批量更新 ioCollectCodeBackService.updateBatchById(filteredList2); } + order.setCheckCodeConfirm(0); + ioCollectOrderBackupService.updateByBillNo(order); } List ioCollectCodeResponses = ioCollectCodeBackService.filterList(request); for (IoCollectCodeResponse ioCollectCodeResponse : ioCollectCodeResponses){ diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java b/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java index 1dcf07a97..0d052575e 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java @@ -150,6 +150,8 @@ public class IoCollectCodeBackService extends ServiceImpl