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

Merge pull request 'demand: 超期额度、账期内额度代码调整' (#4) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/4
This commit is contained in:
smshen 2025-04-25 11:24:14 +08:00
commit d0d9f73e03
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -536,15 +536,6 @@ public class EmisWaybillController extends EmisBaseController
// 设置通用权限查询参数 // 设置通用权限查询参数
list = emisWaybillService.selectEmisWaybillList(emisWaybill); 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); return getDataTable(list);
} }

3
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
View File

@ -675,9 +675,6 @@ public class EmisWaybill extends BaseEntity
private String customerNickName; private String customerNickName;
@TableField(exist = false) @TableField(exist = false)
private String customerAvatar; private String customerAvatar;
// 查询现金客户额度属性; 1：查询超期额度，2：查询账期内额度
@TableField(exist = false)
private String queryQuotaType;
// transType - 运输类型 // transType - 运输类型
@TableField(exist = false) @TableField(exist = false)

4
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -1649,8 +1649,8 @@ public class EmisBaseService {
return Collections.emptyList(); return Collections.emptyList();
} }
List<EmisWaybill> overTermList = list.stream() List<EmisWaybill> overTermList = list.stream()
.filter(item -> item.getOrderDate() != null) .filter(item -> item.getSendDate() != null)
.filter(item -> (System.currentTimeMillis() - item.getOrderDate().getTime()) > (10 * 1000 * 60 * 60 * 24)) .filter(item -> (System.currentTimeMillis() - item.getSendDate().getTime()) > (10 * 1000 * 60 * 60 * 24))
.collect(Collectors.toList()); .collect(Collectors.toList());
log.info("success.filterOverTermEmisWaybillList , overTermList,{}", overTermList); log.info("success.filterOverTermEmisWaybillList , overTermList,{}", overTermList);
return overTermList; return overTermList;

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

@ -1367,6 +1367,15 @@
--> -->
</if> </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.isNeedBatch == null or (params.isNeedBatch != null and params.isNeedBatch != 1) ) " > <if test="(params.isNeedBatch == null or (params.isNeedBatch != null and params.isNeedBatch != 1) ) " >
<if test="(salesmen == null or salesmen=='') and params.privSiteCode != null and params.privSiteCode != '88888'"> <if test="(salesmen == null or salesmen=='') and params.privSiteCode != null and params.privSiteCode != '88888'">