|
|
@@ -1171,7 +1171,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
if(StringUtils.isNotBlank(salesmanName)) params.put("salesmanName", salesmanName);
|
|
|
if(StringUtils.isNotBlank(financeId)) params.put("financeId", financeId);
|
|
|
if(StringUtils.isNotBlank(financeName)) params.put("financeName", financeName);
|
|
|
- if(orderStatus != null) params.put("orderStatus", OrderStage.SIGNED.getCode()); //已签单
|
|
|
+ if(orderStatus != null) params.put("orderStatus", orderStatus);
|
|
|
if(liquidationStatus != null) params.put("liquidationStatus", liquidationStatus);
|
|
|
if(approval != null) params.put("approval", approval);
|
|
|
if(StringUtils.isNotBlank(startDate)) params.put("startDate", startDate);
|
|
|
@@ -1206,13 +1206,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
public Pagination<BillListBo> queryMyBillList(String payeeName, String payerName, String depId,
|
|
|
String salesmanName,String orderNo, Integer confirmSign,Integer deleteSign, Integer pageNo, Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
- if(StringUtils.isNotBlank(payerName)) params.put("payeeName", payeeName);
|
|
|
+ if(StringUtils.isNotBlank(payeeName)) params.put("payeeName", payeeName);
|
|
|
if(StringUtils.isNotBlank(payerName)) params.put("payerName", payerName);
|
|
|
if(StringUtils.isNotBlank(depId)) params.put("depId", depId);
|
|
|
if(StringUtils.isNotBlank(salesmanName)) params.put("salesmanName", salesmanName);
|
|
|
if(StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
|
|
|
if(confirmSign != null) params.put("confirmSign", confirmSign);
|
|
|
- if(confirmSign != null) params.put("deleteSign", deleteSign);
|
|
|
+ if(deleteSign != null) params.put("deleteSign", deleteSign);
|
|
|
/** 特殊处理字段开始 **/
|
|
|
if(!TokenManager.hasRole(AFTConstants.SUPERADMIN)){
|
|
|
params.put("isFinance", 0);
|
|
|
@@ -1227,7 +1227,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
public Pagination<BillListBo> queryAllBillList(String payeeName, String payerName, String depId,
|
|
|
String salesmanName ,String financeName, String orderNo, Integer pageNo, Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
- if(StringUtils.isNotBlank(payerName)) params.put("payeeName", payeeName);
|
|
|
+ if(StringUtils.isNotBlank(payeeName)) params.put("payeeName", payeeName);
|
|
|
if(StringUtils.isNotBlank(payerName)) params.put("payerName", payerName);
|
|
|
if(StringUtils.isNotBlank(depId)) params.put("depId", depId);
|
|
|
if(StringUtils.isNotBlank(salesmanName)) params.put("salesmanName", salesmanName);
|