From 0e0c19f095d67d37fc7d8bc826ee050d7c62527f Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sat, 17 Aug 2024 19:01:57 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IoCollectOrderCodeManController.java | 2 +- .../collect/IoCollectOrderController.java | 15 ++++++++--- .../collect/CollectOrderBindWorkRequest.java | 1 + .../collect/IoCollectOrderService.java | 27 +++++++++++++++---- .../mapper/basic/BasicSkPrescribeMapper.xml | 2 +- 5 files changed, 37 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java index 6ee116e60..6c31b89ea 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java @@ -128,7 +128,7 @@ public class IoCollectOrderCodeManController extends BaseController { if (StrUtil.isEmpty(addTagCodeReqeust.getBillNo())) { String orderNo = gennerOrderUtils.createWdOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd")); BasicCollectBustypeEntity bustypeEntity = bustypeService.findByCode(workPlace.getOrderId()); - IoCollectOrder.builder() + collectOrder = IoCollectOrder.builder() .billNo(orderNo) .busType(bustypeEntity.getCode()) .fromType(bustypeEntity.getFromType()) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index e697779fb..f7d6e9219 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -9,7 +9,9 @@ import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.basic.BasicSkPrescribeEntity; import com.glxp.api.entity.collect.IoCollectOrder; +import com.glxp.api.req.basic.PrescribeBindWorkRequest; import com.glxp.api.req.collect.CollectOrderBindWorkRequest; import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.CollectOrderRequest; @@ -22,6 +24,7 @@ import com.glxp.api.service.collect.IoCollectOrderBizService; import com.glxp.api.service.collect.IoCollectOrderService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -155,11 +158,17 @@ public class IoCollectOrderController extends BaseController { @PostMapping("/udiwms/basic/collect/order/bindWork") public BaseResponse bindWork(@RequestBody CollectOrderBindWorkRequest bindWorkRequest) { - - for (IoCollectOrder collectOrder : bindWorkRequest.getList()) { + if (bindWorkRequest.getCollOrder() != null) { + IoCollectOrder collectOrder = bindWorkRequest.getCollOrder(); collectOrder.setWorkPlaceCode(bindWorkRequest.getWorkplaceCode()); + collectOrderService.updateById(collectOrder); + } else { + for (IoCollectOrder collectOrder : bindWorkRequest.getList()) { + collectOrder.setWorkPlaceCode(bindWorkRequest.getWorkplaceCode()); + } + collectOrderService.updateBatchById(bindWorkRequest.getList()); } - collectOrderService.updateBatchById(bindWorkRequest.getList()); + return ResultVOUtils.success("绑定成功"); } diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderBindWorkRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderBindWorkRequest.java index 2b8b0675b..49d313ea1 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderBindWorkRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderBindWorkRequest.java @@ -9,5 +9,6 @@ import java.util.List; public class CollectOrderBindWorkRequest { List list; + IoCollectOrder collOrder; String workplaceCode; } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index 510fbfd0b..41d65a087 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -11,10 +11,15 @@ import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.req.collect.CollectOrderRequest; +import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.collect.IoCollectOrderResponse; +import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.service.basic.BasicCollectBustypeService; +import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; +import com.glxp.api.util.IntUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -54,15 +59,19 @@ public class IoCollectOrderService extends ServiceImpl list = orderService.selectAll(); + FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); + filterOrderRequest.setPage(1); + filterOrderRequest.setLimit(1000); + List list = orderService.filterList(filterOrderRequest); List collectOrderList = new ArrayList<>(); - for (IoOrderEntity ioOrderEntity : list) { + for (IoOrderResponse ioOrderEntity : list) { BasicCollectBustypeEntity collectBustypeEntity = collectBustypeService.findByAddr(ioOrderEntity.getAction()); if (collectBustypeEntity == null) continue; @@ -73,11 +82,10 @@ public class IoCollectOrderService extends ServiceImpl collectOrderBizs = new ArrayList<>(); for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) { + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(bizEntity.getBindRlFk() + ""); IoCollectOrderBiz collectOrderBiz = IoCollectOrderBiz.builder().orderIdFk(collectOrder.getBillNo()) .relId(bizEntity.getBindRlFk()) + .thrCode(udiRelevanceResponse.getMainId()) + .ybbm(udiRelevanceResponse.getYbbm()) + .payFeeCode(udiRelevanceResponse.getPayFeeCode()) .cpmctymc(bizEntity.getCoName()) .nameCode(bizEntity.getNameCode()) .ggxh(bizEntity.getSpec()) @@ -99,6 +111,11 @@ public class IoCollectOrderService extends ServiceImpl SELECT basic_sk_prescribe.*, basic_sk_sicker.name sickName, sys_workplace.workplaceName FROM basic_sk_prescribe - inner join basic_sk_sicker on basic_sk_prescribe.sickerCode = basic_sk_sicker.code + left join basic_sk_sicker on basic_sk_prescribe.sickerCode = basic_sk_sicker.code left join sys_workplace on basic_sk_prescribe.workPlaceCode = sys_workplace.workplaceId