diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoiceRemarkSetServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoiceRemarkSetServiceImpl.java index 04cde62e..eb40e32c 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoiceRemarkSetServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoiceRemarkSetServiceImpl.java @@ -56,6 +56,7 @@ public class InvoiceRemarkSetServiceImpl implements InvoiceRemarkSetService { for(int i=0;i queryMap = new HashMap<>(); + queryMap.put("bzdh",bzdh); + List orderProcessInfos = orderProcessInfoMapper.queryOrderInfo(queryMap, null, null); + if(orderProcessInfos.size()!=1){ + esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_E.getKey()); + esOutput.setZMESSAGE("根据报账单号未查询到唯一结算单"); + }else { + OrderProcessInfo orderProcessInfo = orderProcessInfos.get(0); + orderProcessInfo.setBhzt(ConfigureConstant.STRING_1); + int i = orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo, null); + if(i == 1){ + esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey()); + esOutput.setZMESSAGE("驳回状态更新成功"); + }else { + esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_E.getKey()); + esOutput.setZMESSAGE("驳回状态更新失败"); + } + } poCommonResponseParam.setES_OUTPUT(esOutput); return poCommonResponseParam; } diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml index b9e4750a..c7f49b50 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml @@ -571,19 +571,6 @@ #{item} or op.ent_id is null) - - - - - order by op.update_time desc - - - order by op.ddcjsj asc - - - order by op.ddcjsj desc,op.num desc,op.create_time desc,op.id desc - - and op.bzdh = #{map.bzdh,jdbcType=VARCHAR} @@ -614,6 +601,20 @@ and op.origin_order_id = #{map.originOrderId,jdbcType=VARCHAR} + + + + + order by op.update_time desc + + + order by op.ddcjsj asc + + + order by op.ddcjsj desc,op.num desc,op.create_time desc,op.id desc + + + @@ -869,10 +870,10 @@ yzfp = #{processInfo.yzfp,jdbcType=VARCHAR}, - yzfp = #{processInfo.originDdh,jdbcType=VARCHAR}, + origin_ddh = #{processInfo.originDdh,jdbcType=VARCHAR}, - yzfp = #{processInfo.originOrderId,jdbcType=VARCHAR}, + origin_order_id = #{processInfo.originOrderId,jdbcType=VARCHAR},