aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-03-16 21:19:24 +08:00
parent a971e2aa8a
commit 37d86b2053
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java
View File

@ -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);
}