|
|
@@ -1225,7 +1225,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<BillListBo> queryAllBillList(String payeeName, String payerName, String depId,
|
|
|
- String salesmanName ,String financeName, String orderNo, Integer pageNo, Integer pageSize) {
|
|
|
+ String salesmanName ,String financeName, String orderNo, Integer confirmSign,Integer deleteSign,Integer pageNo, Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
if(StringUtils.isNotBlank(payeeName)) params.put("payeeName", payeeName);
|
|
|
if(StringUtils.isNotBlank(payerName)) params.put("payerName", payerName);
|
|
|
@@ -1233,6 +1233,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
if(StringUtils.isNotBlank(salesmanName)) params.put("salesmanName", salesmanName);
|
|
|
if(StringUtils.isNotBlank(financeName)) params.put("financeName", financeName);
|
|
|
if(orderNo != null) params.put("orderNo", orderNo);
|
|
|
+ if(confirmSign != null) params.put("confirmSign", confirmSign);
|
|
|
+ if(deleteSign != null) params.put("deleteSign", deleteSign);
|
|
|
Pagination<BillListBo> data = (Pagination<BillListBo>)findPage("selectBillByPage","selectBillCount", params, pageNo, pageSize);
|
|
|
List<BillListBo> list = (List<BillListBo>)data.getList();
|
|
|
if(list.size()>0){
|