|
|
@@ -55,7 +55,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<TOrderInvoiceBo> financeOrderInvoiceList(String depId, String orderNo, String name, String type,Integer pageNo,
|
|
|
+ public Pagination<TOrderInvoiceBo> financeOrderInvoiceList(String orderDep, String orderNo, String name, String type,Integer pageNo,
|
|
|
Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
if(pageSize==null||pageSize<0)pageSize=10;
|
|
|
@@ -63,7 +63,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
|
|
|
if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
|
|
|
params.put("financeId", TokenManager.getAdminId());
|
|
|
}
|
|
|
- if(StringUtils.isNotBlank(depId))params.put("depId", depId);
|
|
|
+ if(StringUtils.isNotBlank(orderDep))params.put("orderDep", orderDep);
|
|
|
if(StringUtils.isNotBlank(type))params.put("type", type);
|
|
|
if(StringUtils.isNotBlank(orderNo))params.put("orderNo", orderNo);
|
|
|
if(StringUtils.isNotBlank(name))params.put("name", name);
|
|
|
@@ -98,12 +98,12 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<TOrderInvoiceBo> approvalOrderInvoiceList(Integer type, String depId, String orderNo, String name,
|
|
|
+ public Pagination<TOrderInvoiceBo> approvalOrderInvoiceList(Integer type, String orderDep, String orderNo, String name,
|
|
|
Integer pageNo, Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
if(pageSize==null||pageSize<0)pageSize=10;
|
|
|
if(pageNo==null||pageNo<0)pageNo=1;
|
|
|
- if(StringUtils.isNotBlank(depId))params.put("depId", depId);
|
|
|
+ if(StringUtils.isNotBlank(orderDep))params.put("orderDep", orderDep);
|
|
|
if(StringUtils.isNotBlank(orderNo))params.put("orderNo", orderNo);
|
|
|
if(StringUtils.isNotBlank(name))params.put("name", name);
|
|
|
if(type!=null)params.put("type", type);
|