From fd8cbc1e864ec0051a8ae0e48953248583a37989 Mon Sep 17 00:00:00 2001 From: zane Date: Mon, 9 Sep 2024 15:08:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E4=B8=8B=E7=9A=84?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/collect/DownloadFactory.java | 34 +++++++++---------- .../collect/IoCollectOriginService.java | 23 ++++++++++++- 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java index a8666a4fc..aa3f50d6f 100644 --- a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java +++ b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java @@ -1,5 +1,6 @@ package com.glxp.api.service.collect; +import cn.hutool.core.util.StrUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusTypeConstant; @@ -29,23 +30,22 @@ public class DownloadFactory { */ public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) { String busType = collectOrderRequest.getBusType(); -// if (busType == null) { -// return ResultVOUtils.error("下载失败，未配置业务类型"); -// } -// if (busType.equals(BusTypeConstant.YPCF002.getBusType())) { -// return ypcf002Download.downloadOrder(collectOrderRequest); -// } else if (busType.equals(BusTypeConstant.CGJH001.getBusType())) { -// return thrOrderDownload.downloadOrder(collectOrderRequest); -// } else if (busType.equals(BusTypeConstant.LYRK.getBusType())) { -// return thrOrderDownload.downloadOrder(collectOrderRequest); -// } else if (busType.equals(BusTypeConstant.GMRK.getBusType())) { -// return thrOrderDownload.downloadOrder(collectOrderRequest); -// } else if (busType.equals(BusTypeConstant.LYCK.getBusType())) { -// return thrOrderDownload.downloadOrder(collectOrderRequest); -// } - - return thrOrderDownload.downloadOrder(collectOrderRequest); -// return ResultVOUtils.error("下载失败，未配置业务类型"); + if (StrUtil.isBlank(busType)) { + return ResultVOUtils.error("下载失败，未配置业务类型"); + } + if (busType.equals(BusTypeConstant.YPCF002.getBusType())) { + return ypcf002Download.downloadOrder(collectOrderRequest); + } else if (busType.equals(BusTypeConstant.CGJH001.getBusType())) { + return thrOrderDownload.downloadOrder(collectOrderRequest); + } else if (busType.equals(BusTypeConstant.LYRK.getBusType())) { + return thrOrderDownload.downloadOrder(collectOrderRequest); + } else if (busType.equals(BusTypeConstant.GMRK.getBusType())) { + return thrOrderDownload.downloadOrder(collectOrderRequest); + } else if (busType.equals(BusTypeConstant.LYCK.getBusType())) { + return thrOrderDownload.downloadOrder(collectOrderRequest); + } + + return ResultVOUtils.error("下载失败，未配置业务类型"); } } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java index ec2bef7ba..4097dfbdd 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.dao.basic.SysWorkplaceDocumentDao; import com.glxp.api.entity.basic.BasicSkPrescribeEntity; import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; import com.glxp.api.entity.collect.IoCollectOrder; @@ -16,10 +17,12 @@ import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.exception.JsonException; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.basic.GetSickPrescribeRequest; +import com.glxp.api.req.basic.WorkBindBusTypeRequest; import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicSkPrescribeResponse; +import com.glxp.api.res.basic.SysWorkplaceDocumentResponse; import com.glxp.api.service.basic.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -49,6 +52,8 @@ public class IoCollectOriginService { IoCollectOrderBizService collectOrderBizService; @Resource private DownloadFactory downloadFactory; + @Resource + private SysWorkplaceDocumentDao sysWorkplaceDocumentDao; public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) { @@ -93,7 +98,23 @@ public class IoCollectOriginService { public BaseResponse downloadOrderV2(CollectOrderRequest collectOrderRequest) { //条件 - return downloadFactory.downloadOrder(collectOrderRequest); + String busType = collectOrderRequest.getBusType(); + if(StrUtil.isBlank(busType)){ + //下载工位下的类型 + WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest(); + workBindBusTypeRequest.setWorkplaceCode(collectOrderRequest.getWorkPlaceCode()); + List sysWorkplaceDocumentResponses = sysWorkplaceDocumentDao.filterList(workBindBusTypeRequest); + if(CollUtil.isNotEmpty(sysWorkplaceDocumentResponses)){ + for (SysWorkplaceDocumentResponse sysWorkplaceDocumentResponse :sysWorkplaceDocumentResponses){ + String documentTypeCode = sysWorkplaceDocumentResponse.getDocumentTypeCode(); + collectOrderRequest.setBusType(documentTypeCode); + downloadFactory.downloadOrder(collectOrderRequest); + } + } + return ResultVOUtils.success("下载成功"); + }else{ + return downloadFactory.downloadOrder(collectOrderRequest); + } } From ef36900de7accbd935fe14c30b508d614a9c356f Mon Sep 17 00:00:00 2001 From: zane Date: Mon, 9 Sep 2024 15:08:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E4=B8=8B=E7=9A=84?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/req/basic/WorkBindBusTypeRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/req/basic/WorkBindBusTypeRequest.java b/src/main/java/com/glxp/api/req/basic/WorkBindBusTypeRequest.java index 864e9719c..33c4a54a9 100644 --- a/src/main/java/com/glxp/api/req/basic/WorkBindBusTypeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/WorkBindBusTypeRequest.java @@ -14,7 +14,7 @@ import java.util.List; @Data public class WorkBindBusTypeRequest extends ListPageRequest { // private List documentTypeCode; - private String workplaceCode; + private Long workplaceCode; private String code; private String busKey; private String workKey;