|
|
@@ -112,7 +112,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<TOrderInvoiceBo> approvalOrderInvoiceList(Integer approval,Integer type, String orderDep, String orderNo, String name,
|
|
|
+ public Pagination<TOrderInvoiceBo> approvalOrderInvoiceList(Integer status,Integer approval,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;
|
|
|
@@ -121,12 +121,20 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
|
|
|
if(StringUtils.isNotBlank(orderNo))params.put("orderNo", orderNo);
|
|
|
if(StringUtils.isNotBlank(name))params.put("name", name);
|
|
|
if(approval!=null)params.put("approval", approval);
|
|
|
- if(type!=null)params.put("type", type);
|
|
|
+ if(status!=null)params.put("status", status);
|
|
|
+ //0省内 1省外 2查看所有省外
|
|
|
+ if(type==0||type==1)params.put("type", type);
|
|
|
+ if (type==2) {
|
|
|
+ params.put("type", 1);
|
|
|
+ params.put("special", 1);
|
|
|
+ }
|
|
|
if (type ==1) {
|
|
|
//如果是省外则直接查本部门
|
|
|
Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
|
|
|
params.put("aDep", a.getDepartmentId());
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
return (Pagination<TOrderInvoiceBo>)findPage("approvalOrderInvoiceList", "approvalOrderInvoiceCount", params, pageNo, pageSize);
|
|
|
}
|
|
|
|