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

Merge pull request 'develop' (#9) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/9
This commit is contained in:
smshen 2025-04-30 11:37:55 +08:00
commit 7bce2c21d3
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java
View File

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

10
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -1764,6 +1764,16 @@
)
</if>
<!-- 查询现金客户额度属性; 1：查询超期额度，2：查询账期内额度 -->
<if test="params.queryQuotaType != null and params.queryQuotaType == 1">
and a.send_date is not null
and (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(a.send_date)) > (10 * 24 * 60 * 60)
</if>
<if test="params.queryQuotaType != null and params.queryQuotaType == 2">
and a.send_date is not null
and (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(a.send_date)) <![CDATA[ <= ]]> (10 * 24 * 60 * 60)
</if>
<if test="params.waybillStatType != null and params.waybillStatType == 1">
and a.order_type='0'