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 164a60972..f04bf1ab9 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 @@ -536,15 +536,6 @@ public class EmisWaybillController extends EmisBaseController // 设置通用权限查询参数 list = emisWaybillService.selectEmisWaybillList(emisWaybill); } - - if("1".equals(emisWaybill.getQueryQuotaType())){ - // 查询超期的运单列表 - list = emisBaseService.filterOverTermEmisWaybillList(list); - } - if("2".equals(emisWaybill.getQueryQuotaType())){ - // 查询未超期的账单列表 - list = emisBaseService.filterInTermEmisWaybillList(list); - } return getDataTable(list); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java index 1f26d2625..9197fad63 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java @@ -675,9 +675,6 @@ public class EmisWaybill extends BaseEntity private String customerNickName; @TableField(exist = false) private String customerAvatar; - // 查询现金客户额度属性; 1:查询超期额度,2:查询账期内额度 - @TableField(exist = false) - private String queryQuotaType; // transType - 运输类型 @TableField(exist = false) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 445c5684e..e9f991c3e 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -1649,8 +1649,8 @@ public class EmisBaseService { return Collections.emptyList(); } List overTermList = list.stream() - .filter(item -> item.getOrderDate() != null) - .filter(item -> (System.currentTimeMillis() - item.getOrderDate().getTime()) > (10 * 1000 * 60 * 60 * 24)) + .filter(item -> item.getSendDate() != null) + .filter(item -> (System.currentTimeMillis() - item.getSendDate().getTime()) > (10 * 1000 * 60 * 60 * 24)) .collect(Collectors.toList()); log.info("success.filterOverTermEmisWaybillList , overTermList,{}", overTermList); return overTermList; diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index c888fe3e4..001bc3994 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -1367,6 +1367,15 @@ --> + + + and a.send_date is not null + and (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(a.send_date)) > (10 * 24 * 60 * 60) + + + and a.send_date is not null + and (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(a.send_date)) (10 * 24 * 60 * 60) +