diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java index 94ee043f5..94406b93a 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java @@ -94,7 +94,7 @@ public class EmisSiteController extends EmisBaseController /** * 查询海运网点 */ - @PreAuthorize("@ss.hasPermi('emis:emisSite:listSeaWay')") +// @PreAuthorize("@ss.hasPermi('emis:emisSite:listSeaWay')") @JacksonFilter(include= {"id","siteCode","siteName","siteNameEn","parentSiteCode","province","provinceName","sizeCode2","sizeCode3"},value=EmisSite.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @GetMapping("/listSeaWay") public TableDataInfo listSeaWay(EmisSite emisSite) diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index a25bc16d9..e88fe1e12 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -1764,6 +1764,16 @@ ) + + + 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) + + and a.order_type='0'