Browse Source

订单流水查询修改

wanghui 7 years ago
parent
commit
8ac72dab26

+ 2 - 2
src/main/java/com/goafanti/order/controller/AdminOrderApiController.java

@@ -424,9 +424,9 @@ public class AdminOrderApiController extends CertifyApiController {
 	/** 所有订单流水查询 **/
 	@RequestMapping(value = "/queryAllBill", method = RequestMethod.POST)
 	public Result queryAllBill(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){
 		Result res = new Result();
-		res.setData(orderServiceImpl.queryAllBillList(payeeName, payerName, depId, salesmanName,financeName, orderNo, pageNo, pageSize));
+		res.setData(orderServiceImpl.queryAllBillList(payeeName, payerName, depId, salesmanName,financeName, orderNo,confirmSign,deleteSign, pageNo, pageSize));
 		return res;
 	}
 	

+ 1 - 1
src/main/java/com/goafanti/order/service/OrderService.java

@@ -305,7 +305,7 @@ public interface OrderService {
 	 * @return
 	 */
 	Pagination<BillListBo> queryAllBillList(String payeeName,String payerName,String depId,String salesmanName,String financeName,String orderNo,
-			Integer pageNo,Integer pageSize);
+			 Integer confirmSign,Integer deleteSign,Integer pageNo,Integer pageSize);
 	
 	/**
 	 * 查看流水详情

+ 3 - 1
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -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){