|
|
@@ -263,12 +263,12 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
|
|
|
}
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<ReceivablesListBo> listReceivables(ReceivablesListBo rl,Integer status,String adminName, String adminDeps, String orderDeps, Integer pageSize,
|
|
|
- Integer pageNo) {
|
|
|
+ public Pagination<ReceivablesListBo> listReceivables(ReceivablesListBo rl,Integer status,String adminName, String adminDeps, String orderDeps,
|
|
|
+ Integer mergeStatus,Integer pageSize, Integer pageNo) {
|
|
|
Map<String,Object> parameter=new HashMap<String, Object>();
|
|
|
if(pageSize==null||pageSize<1)pageSize=10;
|
|
|
if(pageNo==null||pageNo<1)pageNo=1;
|
|
|
- addParemeter(rl, status, adminName, adminDeps, orderDeps, parameter);
|
|
|
+ addParemeter(rl, status, adminName, adminDeps, orderDeps,mergeStatus, parameter);
|
|
|
Pagination<ReceivablesListBo> p=(Pagination<ReceivablesListBo>) findPage("selectReceivablesList", "selectReceivablesCount", parameter, pageNo, pageSize);
|
|
|
List<ReceivablesListBo> list=(List<ReceivablesListBo>) p.getList();
|
|
|
|
|
|
@@ -289,7 +289,8 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
|
|
|
return p;
|
|
|
}
|
|
|
|
|
|
- private void addParemeter(ReceivablesListBo rl, Integer status, String adminName, String adminDeps, String orderDeps, Map<String, Object> parameter) {
|
|
|
+ private void addParemeter(ReceivablesListBo rl, Integer status, String adminName, String adminDeps, String orderDeps,
|
|
|
+ Integer mergeStatus,Map<String, Object> parameter) {
|
|
|
if(StringUtils.isNotBlank(rl.getContractNo())) parameter.put("contractNo", rl.getContractNo());
|
|
|
if(StringUtils.isNotBlank(rl.getOrderNo())) parameter.put("orderNo", rl.getOrderNo());
|
|
|
if(StringUtils.isNotBlank(rl.getNickname())) parameter.put("nickname", rl.getNickname());
|
|
|
@@ -301,15 +302,16 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
|
|
|
if(StringUtils.isNotBlank(orderDeps)){
|
|
|
parameter.put("orderDeps", departmentService.parseArray(orderDeps));
|
|
|
}
|
|
|
- if(null!= status) parameter.put("status", status);
|
|
|
+ if(null == status) parameter.put("status", status);
|
|
|
+ if(null!= mergeStatus) parameter.put("mergeStatus", mergeStatus);
|
|
|
if(StringUtils.isNotBlank(TokenManager.getAdminId())) parameter.put("aid", TokenManager.getAdminId());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public Map<String, Object> getCountlistReceivables(ReceivablesListBo rl, Integer status, String adminName,
|
|
|
- String adminDeps, String orderDeps) {
|
|
|
+ String adminDeps, String orderDeps,Integer mergeStatus) {
|
|
|
Map<String,Object> parameter=new HashMap<String, Object>();
|
|
|
- addParemeter(rl, status, adminName, adminDeps, orderDeps, parameter);
|
|
|
+ addParemeter(rl, status, adminName, adminDeps, orderDeps, mergeStatus, parameter);
|
|
|
//计算回收表的订单总金额与当前总收款额。
|
|
|
Map<String,Object> map=new HashMap<String, Object>();
|
|
|
map.put("totalAmount", new BigDecimal(temporaryReceivablesMapper.getCountlistReceivablesTotalAmount(parameter)).stripTrailingZeros() );
|
|
|
@@ -574,7 +576,12 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
|
|
|
public int pushWaitingMerge(String ids) {
|
|
|
String[] split = ids.split(",");
|
|
|
List<String> list= Arrays.asList(split);
|
|
|
- return temporaryReceivablesMapper.waitngMerge(list);
|
|
|
+ List<Integer> intList=new ArrayList<>();
|
|
|
+ list.forEach(e ->{
|
|
|
+ intList.add(Integer.valueOf(e));
|
|
|
+ });
|
|
|
+ temporaryReceivablesMapper.waitngMerge(intList);
|
|
|
+ return 1;
|
|
|
}
|
|
|
|
|
|
}
|