From 37d86b205360babd91df4d2b6412f7b567479073 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 16 Mar 2025 21:19:24 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisCommissionDtlController.java | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java
index 77a69ca2e..e01ce700a 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java
@@ -11,8 +11,12 @@
 
 package com.xdadan.erp.web.emis;
 
+import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.xdadan.erp.emis.utils.WaybillHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,7 +33,6 @@ import com.xdadan.erp.common.core.controller.BaseController;
 import com.xdadan.erp.common.core.domain.AjaxResult;
 import com.xdadan.erp.common.core.page.TableDataInfo;
 import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.StringUtils;
 import com.xdadan.erp.common.utils.poi.ExcelUtil;
 
 import com.xdadan.erp.emis.domain.EmisCommissionDtl;
@@ -56,6 +59,14 @@ public class EmisCommissionDtlController extends BaseController
     public TableDataInfo list(EmisCommissionDtl emisCommissionDtl)
     {
         startPage();
+        if(!StringUtils.isEmpty(emisCommissionDtl.getBillCode())){
+            emisCommissionDtl.setBillCode(WaybillHelper.formatQueryValue(emisCommissionDtl.getBillCode()));
+            String[] billCodeSortList = emisCommissionDtl.getBillCode().split(",");
+            if(billCodeSortList.length>1){
+                emisCommissionDtl.getParams().put("billCodeSortList", Arrays.asList(billCodeSortList));
+            }
+        }
+
         List<EmisCommissionDtl> list = emisCommissionDtlService.selectEmisCommissionDtlList(emisCommissionDtl);
         return getDataTable(list);
     }
@@ -70,6 +81,13 @@ public class EmisCommissionDtlController extends BaseController
     public TableDataInfo listBatch(EmisCommissionDtl emisCommissionDtl)
     {
         startPage();
+        if(!StringUtils.isEmpty(emisCommissionDtl.getBillCode())){
+            emisCommissionDtl.setBillCode(WaybillHelper.formatQueryValue(emisCommissionDtl.getBillCode()));
+            String[] billCodeSortList = emisCommissionDtl.getBillCode().split(",");
+            if(billCodeSortList.length>1){
+                emisCommissionDtl.getParams().put("billCodeSortList", Arrays.asList(billCodeSortList));
+            }
+        }
         List<EmisCommissionDtl> list = emisCommissionDtlService.selectBatchCommissionDtlList(emisCommissionDtl);
         return getDataTable(list);
     }