Commit 75d3ed8d authored by wangzb's avatar wangzb

feature-wzb :bug修复

parent 482da095
...@@ -518,7 +518,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme ...@@ -518,7 +518,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
if(vo.getUrgencyExtent().equals(CommonConstants.TWO_STRING)){ if(vo.getUrgencyExtent().equals(CommonConstants.TWO_STRING)){
vo.setUrgencyExtent("紧急(3-5小时)"); vo.setUrgencyExtent("紧急(3-5小时)");
} }
if(vo.getUrgencyExtent().equals(CommonConstants.THREE_STRING)){ if(vo.getUrgencyExtent().equals(CommonConstants.SEVEN_STRING)){
vo.setUrgencyExtent("常规(5-8小时)"); vo.setUrgencyExtent("常规(5-8小时)");
} }
List<TSettleDomainSelectVo> settleDomainR; List<TSettleDomainSelectVo> settleDomainR;
...@@ -686,11 +686,6 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme ...@@ -686,11 +686,6 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
if (Common.isEmpty(vo.getOrderNo())){ if (Common.isEmpty(vo.getOrderNo())){
return R.failed(OrderConstants.ORDER_NO_IS_EMPTY); return R.failed(OrderConstants.ORDER_NO_IS_EMPTY);
} }
TOrder one = this.getOne(Wrappers.<TOrder>query().lambda()
.eq(TOrder::getOrderNo, vo.getOrderNo())
.eq(TOrder::getDeleteFlag,CommonConstants.ZERO_INT)
.last(CommonConstants.LAST_ONE_SQL)
);
if (ArrayUtils.isNotEmpty(vo.getFile())){ if (ArrayUtils.isNotEmpty(vo.getFile())){
if (vo.getFile().length > CommonConstants.TWENTY_INT){ if (vo.getFile().length > CommonConstants.TWENTY_INT){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment