angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: angelo:26dcb2205d5a6a1cb540b8c48152b849d25eb69e
Branches Tags
angelo:master
angelo:lx-dp_online
angelo:lx_online
angelo:lx_test
angelo:lx_dev
angelo:bd_dev
angelo:bd_test
angelo:sangelxiu1/fipay
angelo:lx_dev_251104
angelo:bd_online
angelo:lx-mh_online
angelo:bd_dev_image
angelo:bd_dev_20250910
..
compare: angelo:bcf2e1df9aa70d5c43028db5eaeccafaaa4472b9
Branches Tags
angelo:lx-dp_online
angelo:lx_online
angelo:lx_test
angelo:lx_dev
angelo:bd_dev
angelo:bd_test
angelo:sangelxiu1/fipay
angelo:lx_dev_251104
angelo:bd_online
angelo:lx-mh_online
angelo:bd_dev_image
angelo:bd_dev_20250910
angelo:master

No commits in common. "26dcb2205d5a6a1cb540b8c48152b849d25eb69e" and "bcf2e1df9aa70d5c43028db5eaeccafaaa4472b9" have entirely different histories.
26dcb2205d ... bcf2e1df9a

2 changed files with 3 additions and 11 deletions
Show Stats Expand all files Collapse all files

8
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java
View File

@ -106,10 +106,6 @@ public class SaDeliverUnhandledController extends BaseController {
param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList());
param.setVertexIdList(userAuthorityDTO.getVertexIdList());
param.setTeamList(userAuthorityDTO.getUserTeamList());
// 兼容调换货产品
if (CollectionUtil.isEmpty(param.getPkWaresList())) {
param.setPkWaresList(Collections.singletonList(0));
}
startPage();
List<DeliverUnhandledVO> resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry);
@ -153,10 +149,6 @@ public class SaDeliverUnhandledController extends BaseController {
param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList());
param.setVertexIdList(userAuthorityDTO.getVertexIdList());
param.setTeamList(userAuthorityDTO.getUserTeamList());
// 兼容调换货产品
if (CollectionUtil.isEmpty(param.getPkWaresList())) {
param.setPkWaresList(Collections.singletonList(0));
}
List<DeliverUnhandledVO> resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry);

6
bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml
View File

@ -119,7 +119,7 @@
from sa_order so
where so.del_flag = 0
and so.order_status = 1
and so.order_type in (3, 14, 26, 10)
and so.order_type in (3, 26, 10)
and to_char(so.pay_time, 'yyyy-mm-dd') =
to_char(sysdate, 'yyyy-mm-dd')
) b on 1 = 1
@ -141,7 +141,7 @@
from sa_order so
where so.del_flag = 0
and so.order_status = 1
and so.order_type in (3, 14, 26, 10)
and so.order_type in (3, 26, 10)
and to_char(so.pay_time, 'yyyy-mm-dd') =
to_char(sysdate - 1, 'yyyy-mm-dd')
) b on 1 = 1
@ -165,7 +165,7 @@
from sa_order so
where so.del_flag = 0
and so.order_status = 1
and so.order_type in (3, 14, 26, 10)
and so.order_type in (3, 26, 10)
and to_char(so.pay_time, 'yyyy-mm') =
to_char(sysdate, 'yyyy-mm')
) b on 1 = 1