diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java index e9ae624d9..c21b71608 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java @@ -351,20 +351,27 @@ public class EmisWaybillController extends BaseController /** * 查询扫描统计数据 - * 1-发件清单 2-到件清单 3-派件清单 - * @param scanRecord + * 1-发件清单 2-到件清单 3-派件清单 + * @param scanStatType + * @param beginScanDate + * @param endScanDate + * @param billCode * @return */ - // @JacksonFilter(include= { -// "billCode","scanDate" -// },value= EmisTmsScanRecord.class,type= JacksonFilter.JscksonFilterType.RESPONSE) + @JacksonFilter(include= { + "billCode","scanDate" + },value= EmisTmsScanRecord.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @GetMapping("/queryScanWaybillList") - public TableDataInfo queryScanWaybillList(EmisTmsScanRecord scanRecord) + public TableDataInfo queryScanWaybillList(String scanStatType,Date beginScanDate,Date endScanDate,String billCode ) { - log.debug(JSON.toJSONString(scanRecord)); + EmisTmsScanRecord scanRecord=new EmisTmsScanRecord(); + scanRecord.getParams().put("scanStatType",scanStatType); + scanRecord.getParams().put("beginScanDate",beginScanDate); + scanRecord.getParams().put("beginScanDate",endScanDate); + scanRecord.setBillCode(billCode); // 1-发件清单 2-到件清单 3-派件清单 - String scanStatType=(String)scanRecord.getParams().get("scanStatType"); +// String scanStatType=(String)scanRecord.getParams().get("scanStatType"); if("1".equals(scanStatType)){ scanRecord.setScanType(ScanType.DEPARTURE.opCode); }else if("2".equals(scanStatType)){ @@ -380,6 +387,9 @@ public class EmisWaybillController extends BaseController } scanRecord.setScanSiteCode(getLoginUser().getUser().getOwnerSiteCode()); + log.debug(JSON.toJSONString(scanRecord)); + + startPage(); List list = emisTmsScanRecordService.selectEmisTmsScanRecordList(scanRecord); return getDataTable(list);