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 a118f58fe..de7252bbf 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; @@ -35,16 +36,21 @@ public class DownloadFactory { */ public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) { String busType = collectOrderRequest.getBusType(); - if (busType == null) { + + if (StrUtil.isBlank(busType)) { return ResultVOUtils.error("下载失败,未配置业务类型"); } + if (busType.startsWith("YPCF")) { return ypcf002Download.downloadOrder(collectOrderRequest); - } else if (busType.equals(BusTypeConstant.QXCF001.getBusType())) { + } else + if (busType.equals(BusTypeConstant.QXCF001.getBusType())) { return qxcf001Download.downloadOrder(collectOrderRequest); - } else if (busType.contains("SC")) { + } else + if (busType.contains("SC")) { return ioCollectOrderService.importUdi(collectOrderRequest); - } else { + } else + { return thrOrderDownload.downloadOrder(collectOrderRequest); } } 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 b5ab1a4b4..d7e4ab58d 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java @@ -89,19 +89,17 @@ public class IoCollectOriginService { //下载工位下的类型 List list = sysWorkplaceDocumentService.list(); - if (list == null){ + if (CollUtil.isEmpty(list)){ return ResultVOUtils.error(500, "未查到此业务单据"); } - if (CollUtil.isNotEmpty(list)) { - for (SysWorkplaceDocumentEntity item : list) { - collectOrderRequest.setBusType(item.getDocumentTypeCode()); - downloadFactory.downloadOrder(collectOrderRequest); - } - } else { - return ResultVOUtils.error("未配置业务类型"); + BaseResponse response = new BaseResponse(); + for (SysWorkplaceDocumentEntity item : list) { + collectOrderRequest.setBusType(item.getDocumentTypeCode()); + response = downloadFactory.downloadOrder(collectOrderRequest); } - return ResultVOUtils.success("下载成功"); + return response; + } else { return downloadFactory.downloadOrder(collectOrderRequest); }