diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java index 59695678..7c37c760 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java @@ -214,6 +214,12 @@ public class PurchaseorderController { */ @PostMapping("/getList") public ActionResult list(@RequestBody PurchaseorderPagination purchaseorderPagination) throws IOException { + if(StringUtils.isNotEmpty(purchaseorderPagination.getDocumentNo())){ + List documentNoList = Arrays.asList(purchaseorderPagination.getDocumentNo().split(",")); + purchaseorderPagination.setDocumentNoList(documentNoList); + }else{ + purchaseorderPagination.setDocumentNoList(new ArrayList<>()); + } List list = purchaseorderitemService.getList(purchaseorderPagination); //处理id字段转名称,若无需转或者为空可删除 /*for(PurchaseorderitemEntity entity:list){ @@ -437,6 +443,12 @@ public class PurchaseorderController { if (StringUtil.isEmpty(purchaseorderPaginationExportModel.getSelectKey())) { return ActionResult.fail("请选择导出字段"); } + if(StringUtils.isNotEmpty(purchaseorderPaginationExportModel.getDocumentNo())){ + List documentNoList = Arrays.asList(purchaseorderPaginationExportModel.getDocumentNo().split(",")); + purchaseorderPaginationExportModel.setDocumentNoList(documentNoList); + }else{ + purchaseorderPaginationExportModel.setDocumentNoList(new ArrayList<>()); + } PurchaseorderPagination purchaseorderPagination = JsonUtil.getJsonToBean(purchaseorderPaginationExportModel, PurchaseorderPagination.class); List list = purchaseorderitemService.getTypeList(purchaseorderPagination, purchaseorderPaginationExportModel.getDataType()); //处理id字段转名称,若无需转或者为空可删除 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java index 0069995d..9e2f770d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java @@ -29,6 +29,8 @@ public class PurchaseorderPagination extends Pagination { private String num; private String amount; private String creatorUserName; + /** 单据编号 */ + private List documentNoList; /** diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPaginationExportModel.java index fbfe9190..9a3237f1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPaginationExportModel.java @@ -32,6 +32,8 @@ public class PurchaseorderPaginationExportModel extends Pagination { private String num; private String amount; private String creatorUserName; + /** 单据编号 */ + private List documentNoList; /** diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml index 71c96984..f682a53a 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml @@ -266,9 +266,20 @@ AND a.creator_time > #{purchaseorderPagination.startDate} AND a.creator_time <= #{purchaseorderPagination.endDate} - - AND a.document_no LIKE CONCAT('%',#{purchaseorderPagination.documentNo},'%') - + + + + AND a.document_no IN + + #{item} + + + + + AND a.document_no LIKE CONCAT('%',#{purchaseorderPagination.documentNo},'%') + + + AND c.contract_name LIKE CONCAT('%',#{purchaseorderPagination.purchaseName},'%')