查询修改

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<String> documentNoList = Arrays.asList(purchaseorderPagination.getDocumentNo().split(","));
+            purchaseorderPagination.setDocumentNoList(documentNoList);
+        }else{
+            purchaseorderPagination.setDocumentNoList(new ArrayList<>());
+        }
         List<PurchaseorderitemEntity> 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<String> documentNoList = Arrays.asList(purchaseorderPaginationExportModel.getDocumentNo().split(","));
+            purchaseorderPaginationExportModel.setDocumentNoList(documentNoList);
+        }else{
+            purchaseorderPaginationExportModel.setDocumentNoList(new ArrayList<>());
+        }
         PurchaseorderPagination purchaseorderPagination = JsonUtil.getJsonToBean(purchaseorderPaginationExportModel, PurchaseorderPagination.class);
         List<PurchaseorderitemEntity> list = purchaseorderitemService.getTypeList(purchaseorderPagination, purchaseorderPaginationExportModel.getDataType());
         //处理id字段转名称，若无需转或者为空可删除

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<String> documentNoList;
 
 
     /**

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<String> documentNoList;
 
 
     /**

SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml

@@ -266,9 +266,20 @@
         <if test="purchaseorderPagination.startDate != null and purchaseorderPagination.endDate != null">
             AND a.creator_time &gt; #{purchaseorderPagination.startDate} AND a.creator_time &lt;= #{purchaseorderPagination.endDate}
         </if>
-        <if test="purchaseorderPagination.documentNo != null and purchaseorderPagination.documentNo != ''">
+
-            AND a.document_no LIKE CONCAT('%',#{purchaseorderPagination.documentNo},'%')
+        <choose>
-        </if>
+            <when test="purchaseorderPagination.documentNoList != null and purchaseorderPagination.documentNoList.size()!=0">
+                AND a.document_no IN
+                <foreach collection="purchaseorderPagination.documentNoList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </when>
+            <otherwise>
+                <if test="purchaseorderPagination.documentNo != null and purchaseorderPagination.documentNo != ''">
+                    AND a.document_no LIKE CONCAT('%',#{purchaseorderPagination.documentNo},'%')
+                </if>
+            </otherwise>
+        </choose>
         <if test="purchaseorderPagination.purchaseName != null and purchaseorderPagination.purchaseName != ''">
             AND c.contract_name LIKE CONCAT('%',#{purchaseorderPagination.purchaseName},'%')
         </if>