Merge branch 'dev-snyx' into test

release
gaorl 2 years ago
commit 44c4036696
  1. 6
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@ -2123,7 +2123,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
switch (operation){ switch (operation){
case "0": case "0":
//根据报账单号查询未开发票数,且有效 param:发票请求流水号集合,是否需要添加来源校验 //根据报账单号查询未开发票数,且有效 param:发票请求流水号集合,是否需要添加来源校验
orderProcessInfos = orderProcessInfoMapper.queryOrderProcessInfoByBzdhs(Arrays.asList(params), Arrays.asList(nsrsbh)); orderProcessInfos = orderProcessInfoMapper.queryOrderProcessInfoByBzdhs(Arrays.asList(params.split(",")), Arrays.asList(nsrsbh));
//按照报账单分组统计 //按照报账单分组统计
if(orderProcessInfos == null || orderProcessInfos.isEmpty()){ if(orderProcessInfos == null || orderProcessInfos.isEmpty()){
return R.error("根据报账单号未查询到数据"); return R.error("根据报账单号未查询到数据");
@ -2145,7 +2145,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
//1、根据流水号查询报账单号对应的流水号,如果查为1条,则过滤跳过,如果存在多条且有未开具提示 //1、根据流水号查询报账单号对应的流水号,如果查为1条,则过滤跳过,如果存在多条且有未开具提示
// 2、如果存在多条且有未作废的提示,如果存在已冲红提示 // 2、如果存在多条且有未作废的提示,如果存在已冲红提示
//AND ( oii.zf_bz = '0' OR oii.ch_bz = '0' ) //AND ( oii.zf_bz = '0' OR oii.ch_bz = '0' )
List<String> paramList = Arrays.asList(params); List<String> paramList = Arrays.asList(params.split(","));
orderProcessInfos = orderProcessInfoMapper.selectOrderProcessByFpqqlshs(paramList, Arrays.asList(nsrsbh)); orderProcessInfos = orderProcessInfoMapper.selectOrderProcessByFpqqlshs(paramList, Arrays.asList(nsrsbh));
if(orderProcessInfos == null || orderProcessInfos.isEmpty()){ if(orderProcessInfos == null || orderProcessInfos.isEmpty()){
return R.error("根据报账单号未查询到数据"); return R.error("根据报账单号未查询到数据");
@ -2187,7 +2187,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
* 原发票号码 查询order_invoice_info 在联查 order_process_info 查报账单号再通过报账单号反查 发票请求流水号 * 原发票号码 查询order_invoice_info 在联查 order_process_info 查报账单号再通过报账单号反查 发票请求流水号
* 查到流水号在查红字冲红 * 查到流水号在查红字冲红
*/ */
List<String> list = Arrays.asList(params); List<String> list = Arrays.asList(params.split(","));
List<String> yFpdmHm = list.stream().map(t->{ List<String> yFpdmHm = list.stream().map(t->{
String[] split = t.split("-"); String[] split = t.split("-");
return "('" + split[0] + "','" + split[1] + "')"; return "('" + split[0] + "','" + split[1] + "')";

Loading…
Cancel
Save