From 16e7e8179cab43d447a36114cdba662d472aa7c7 Mon Sep 17 00:00:00 2001 From: yewj Date: Mon, 16 Dec 2024 11:52:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E5=85=A5=E9=98=BF=E9=87=8C=E5=8D=95?= =?UTF-8?q?=E6=8D=AE,=E9=87=8D=E5=A4=8D=E6=89=AB=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/BasicBussinessTypeController.java | 10 +++++----- .../controller/inout/IoOrderDetailBizController.java | 6 +++--- .../glxp/api/req/basic/BussinessTypeSaveRequest.java | 2 ++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index f3cfd923..ae631439 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -265,7 +265,7 @@ public class BasicBussinessTypeController extends BaseController { @GetMapping("/udiwms/localBusType/filterJoinByUserOptimize") public BaseResponse filterJoinByUserOptimize(FilterBussinessTypeRequest bussinessTypeFilterRequest, BindingResult bindingResult) { - List reList = new ArrayList<>(); + List reList = new ArrayList<>(); if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getVueType())) { List result = new ArrayList<>(); List bussinessTypeEntities = basicBussinessTypeService.findByVueTypeAndType(bussinessTypeFilterRequest); @@ -291,8 +291,8 @@ public class BasicBussinessTypeController extends BaseController { result.addAll(bussinessTypeEntities); } - reList = result.stream().map(s-> { - DictDto dictDto = new DictDto(s.getAction(),s.getName()); + reList = result.stream().map(s -> { + DictDto dictDto = new DictDto(s.getAction(), s.getName()); return dictDto; }).collect(Collectors.toList()); } else { @@ -303,8 +303,8 @@ public class BasicBussinessTypeController extends BaseController { bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser( bussinessTypeFilterRequest); - reList = bussinessTypeEntities.stream().map(s-> { - DictDto dictDto = new DictDto(s.getAction(),s.getName()); + reList = bussinessTypeEntities.stream().map(s -> { + DictDto dictDto = new DictDto(s.getAction(), s.getName()); return dictDto; }).collect(Collectors.toList()); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 3796a08c..3aac9006 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -723,8 +723,8 @@ public class IoOrderDetailBizController extends BaseController { if (CollUtil.isEmpty(aliYljgBillDetailDrugList)) { return ResultVOUtils.error("单据明细为空！"); } - List aliYljgBillDetailDrugCodeList = aliYljgBillDetailDrugList.get(0).getAliYljgBillDetailDrugCodeList(); - if (CollUtil.isEmpty(aliYljgBillDetailDrugCodeList)) { + List tempDrug = aliYljgBillDetailDrugList.get(0).getAliYljgBillDetailDrugCodeList(); + if (CollUtil.isEmpty(tempDrug)) { return ResultVOUtils.error("单据码明细为空！"); } @@ -789,7 +789,7 @@ public class IoOrderDetailBizController extends BaseController { BeanUtils.copyProperties(ioOrderEntity, addOrderRequest); for (int j = 0; j < aliYljgBillDetailDrugCodeList1.size(); j++) { - AliYljgBillDetailDrugCode aliYljgBillDetailDrugCode = aliYljgBillDetailDrugCodeList.get(j); + AliYljgBillDetailDrugCode aliYljgBillDetailDrugCode = aliYljgBillDetailDrugCodeList1.get(j); addOrderRequest.setCode(aliYljgBillDetailDrugCode.getCode()); IoCodeLostEntity codeLostEntity = ioCodeLostService.findByCode(aliYljgBillDetailDrugCode.getCode()); diff --git a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java index 12cad534..0cd14f89 100644 --- a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java @@ -328,4 +328,6 @@ public class BussinessTypeSaveRequest { @TableField(value = "productType") private Integer productType; + private Integer checkWebNewType; + }